Merge branch 'new' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new

acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/PmsPatientController.java

@@ -78,4 +78,11 @@ public class PmsPatientController {
         return JsonResponse.ok();
     }
 
+    @ApiOperation("导入患者信息")
+    @PostMapping("/import1")
+    public JsonResponse<Integer> importPatient1(MultipartFile file) throws IOException{
+        pmsPatientService.importPatient1(file);
+        return JsonResponse.ok();
+    }
+
 }

acupuncture-generator/src/main/resources/mbg.xml

@@ -80,8 +80,8 @@
 <!--        <table tableName="fms_followup_queue" domainObjectName="FmsFollowupQueue" enableDeleteByExample="false"/>-->
 <!--        <table tableName="fms_followup_task" domainObjectName="FmsFollowupTask" enableDeleteByExample="false"/>-->
 <!--        <table tableName="fms_patient_queue_relation" domainObjectName="FmsPatientQueueRelation" enableDeleteByExample="false"/>-->
-<!--        <table tableName="pms_patient" domainObjectName="PmsPatient" enableDeleteByExample="false"/>-->
+        <table tableName="pms_patient" domainObjectName="PmsPatient" enableDeleteByExample="false"/>
-        <table tableName="pms_treatment" domainObjectName="PmsTreatment" enableDeleteByExample="false"/>
+<!--        <table tableName="pms_treatment" domainObjectName="PmsTreatment" enableDeleteByExample="false"/>-->
 <!--        <table tableName="pms_treatment_record" domainObjectName="PmsTreatmentRecord" enableDeleteByExample="false"/>-->
 <!--        <table tableName="rms_report_type" domainObjectName="RmsReportType" enableDeleteByExample="false"/>-->
 <!--        <table tableName="rms_report_management" domainObjectName="RmsReportManagement" enableDeleteByExample="false"/>-->

acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/PmsPatientDto.java

@@ -59,7 +59,8 @@ public class PmsPatientDto {
         private String idCard;
 
         private Byte source;
-
+        private String weight;
+        private String height;
         private List<String> currentIllnessHistory;
         private String currentIllnessHistoryQt;
         public String getCurrentIllnessHistory() {
@@ -91,6 +92,8 @@ public class PmsPatientDto {
         private String idCard;
 
         private Byte source;
+        private String weight;
+        private String height;
 
         private List<String> currentIllnessHistory;
         private String currentIllnessHistoryQt;

acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatient.java

@@ -30,7 +30,9 @@ public class PmsPatient implements Serializable {
 
     private String currentIllnessHistory;
 
-    private String currentIllnessHistoryQt;
+    private String weight;
+
+    private String height;
 
     private Byte delFlag;
 
@@ -46,6 +48,8 @@ public class PmsPatient implements Serializable {
 
     private String remark;
 
+    private String currentIllnessHistoryQt;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -152,12 +156,20 @@ public class PmsPatient implements Serializable {
         this.currentIllnessHistory = currentIllnessHistory == null ? null : currentIllnessHistory.trim();
     }
 
-    public String getCurrentIllnessHistoryQt() {
+    public String getWeight() {
-        return currentIllnessHistoryQt;
+        return weight;
     }
 
-    public void setCurrentIllnessHistoryQt(String currentIllnessHistoryQt) {
+    public void setWeight(String weight) {
-        this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim();
+        this.weight = weight == null ? null : weight.trim();
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height == null ? null : height.trim();
     }
 
     public Byte getDelFlag() {
@@ -216,6 +228,14 @@ public class PmsPatient implements Serializable {
         this.remark = remark == null ? null : remark.trim();
     }
 
+    public String getCurrentIllnessHistoryQt() {
+        return currentIllnessHistoryQt;
+    }
+
+    public void setCurrentIllnessHistoryQt(String currentIllnessHistoryQt) {
+        this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -235,7 +255,8 @@ public class PmsPatient implements Serializable {
         sb.append(", idCard=").append(idCard);
         sb.append(", source=").append(source);
         sb.append(", currentIllnessHistory=").append(currentIllnessHistory);
-        sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt);
+        sb.append(", weight=").append(weight);
+        sb.append(", height=").append(height);
         sb.append(", delFlag=").append(delFlag);
         sb.append(", tenantId=").append(tenantId);
         sb.append(", createBy=").append(createBy);
@@ -243,6 +264,7 @@ public class PmsPatient implements Serializable {
         sb.append(", updateBy=").append(updateBy);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", remark=").append(remark);
+        sb.append(", currentIllnessHistoryQt=").append(currentIllnessHistoryQt);
         sb.append("]");
         return sb.toString();
     }

acupuncture-system/src/main/java/com/acupuncture/system/domain/po/PmsPatientExample.java

@@ -982,73 +982,143 @@ public class PmsPatientExample {
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtIsNull() {
+        public Criteria andWeightIsNull() {
-            addCriterion("current_illness_history_qt is null");
+            addCriterion("weight is null");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtIsNotNull() {
+        public Criteria andWeightIsNotNull() {
-            addCriterion("current_illness_history_qt is not null");
+            addCriterion("weight is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtEqualTo(String value) {
+        public Criteria andWeightEqualTo(String value) {
-            addCriterion("current_illness_history_qt =", value, "currentIllnessHistoryQt");
+            addCriterion("weight =", value, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotEqualTo(String value) {
+        public Criteria andWeightNotEqualTo(String value) {
-            addCriterion("current_illness_history_qt <>", value, "currentIllnessHistoryQt");
+            addCriterion("weight <>", value, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtGreaterThan(String value) {
+        public Criteria andWeightGreaterThan(String value) {
-            addCriterion("current_illness_history_qt >", value, "currentIllnessHistoryQt");
+            addCriterion("weight >", value, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtGreaterThanOrEqualTo(String value) {
+        public Criteria andWeightGreaterThanOrEqualTo(String value) {
-            addCriterion("current_illness_history_qt >=", value, "currentIllnessHistoryQt");
+            addCriterion("weight >=", value, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtLessThan(String value) {
+        public Criteria andWeightLessThan(String value) {
-            addCriterion("current_illness_history_qt <", value, "currentIllnessHistoryQt");
+            addCriterion("weight <", value, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtLessThanOrEqualTo(String value) {
+        public Criteria andWeightLessThanOrEqualTo(String value) {
-            addCriterion("current_illness_history_qt <=", value, "currentIllnessHistoryQt");
+            addCriterion("weight <=", value, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtLike(String value) {
+        public Criteria andWeightLike(String value) {
-            addCriterion("current_illness_history_qt like", value, "currentIllnessHistoryQt");
+            addCriterion("weight like", value, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotLike(String value) {
+        public Criteria andWeightNotLike(String value) {
-            addCriterion("current_illness_history_qt not like", value, "currentIllnessHistoryQt");
+            addCriterion("weight not like", value, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtIn(List<String> values) {
+        public Criteria andWeightIn(List<String> values) {
-            addCriterion("current_illness_history_qt in", values, "currentIllnessHistoryQt");
+            addCriterion("weight in", values, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotIn(List<String> values) {
+        public Criteria andWeightNotIn(List<String> values) {
-            addCriterion("current_illness_history_qt not in", values, "currentIllnessHistoryQt");
+            addCriterion("weight not in", values, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtBetween(String value1, String value2) {
+        public Criteria andWeightBetween(String value1, String value2) {
-            addCriterion("current_illness_history_qt between", value1, value2, "currentIllnessHistoryQt");
+            addCriterion("weight between", value1, value2, "weight");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotBetween(String value1, String value2) {
+        public Criteria andWeightNotBetween(String value1, String value2) {
-            addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt");
+            addCriterion("weight not between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIsNull() {
+            addCriterion("height is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIsNotNull() {
+            addCriterion("height is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightEqualTo(String value) {
+            addCriterion("height =", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotEqualTo(String value) {
+            addCriterion("height <>", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThan(String value) {
+            addCriterion("height >", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThanOrEqualTo(String value) {
+            addCriterion("height >=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThan(String value) {
+            addCriterion("height <", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThanOrEqualTo(String value) {
+            addCriterion("height <=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLike(String value) {
+            addCriterion("height like", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotLike(String value) {
+            addCriterion("height not like", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIn(List<String> values) {
+            addCriterion("height in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotIn(List<String> values) {
+            addCriterion("height not in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightBetween(String value1, String value2) {
+            addCriterion("height between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotBetween(String value1, String value2) {
+            addCriterion("height not between", value1, value2, "height");
             return (Criteria) this;
         }
 
@@ -1501,6 +1571,76 @@ public class PmsPatientExample {
             addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andCurrentIllnessHistoryQtIsNull() {
+            addCriterion("current_illness_history_qt is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtIsNotNull() {
+            addCriterion("current_illness_history_qt is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtEqualTo(String value) {
+            addCriterion("current_illness_history_qt =", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtNotEqualTo(String value) {
+            addCriterion("current_illness_history_qt <>", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtGreaterThan(String value) {
+            addCriterion("current_illness_history_qt >", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtGreaterThanOrEqualTo(String value) {
+            addCriterion("current_illness_history_qt >=", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtLessThan(String value) {
+            addCriterion("current_illness_history_qt <", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtLessThanOrEqualTo(String value) {
+            addCriterion("current_illness_history_qt <=", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtLike(String value) {
+            addCriterion("current_illness_history_qt like", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtNotLike(String value) {
+            addCriterion("current_illness_history_qt not like", value, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtIn(List<String> values) {
+            addCriterion("current_illness_history_qt in", values, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtNotIn(List<String> values) {
+            addCriterion("current_illness_history_qt not in", values, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtBetween(String value1, String value2) {
+            addCriterion("current_illness_history_qt between", value1, value2, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCurrentIllnessHistoryQtNotBetween(String value1, String value2) {
+            addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsPatientVo.java

@@ -42,6 +42,8 @@ public class PmsPatientVo {
         @ApiModelProperty("现病史，存储格式：[\"高血压\",\"脑血管病\"]")
         private String currentIllnessHistory;
         private String currentIllnessHistoryQt;
+        private String weight;
+        private String height;
         @ApiModelProperty("建档组织（当前登录账号医院ID）")
         private Long tenantId;
         @ApiModelProperty("创建者")

acupuncture-system/src/main/java/com/acupuncture/system/service/PmsPatientService.java

@@ -50,6 +50,8 @@ public interface PmsPatientService {
 
     void importPatient(MultipartFile file) throws IOException;
 
+    void importPatient1(MultipartFile file) throws IOException;
+
     /**
      * 查询患者信息
      * @param dto

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java

@@ -74,6 +74,7 @@ public class PmsPatientServiceImpl implements PmsPatientService {
             PmsPatient pmsPatient = BeanUtil.copyProperties(dto, PmsPatient.class);
             pmsPatient.setUpdateBy(SecurityUtils.getUsername());
             pmsPatient.setUpdateTime(new Date());
+            pmsPatient.setId(pmsPatients.get(0).getId());
             pmsPatient.setPinyinFull(PinyinUtil.getPinyin(dto.getName(), ""));
             pmsPatient.setPinyinSimple(PinyinUtil.getFirstLetter(dto.getName(), ""));
             pmsPatientMapper.updateByPrimaryKeySelective(pmsPatient);
@@ -269,6 +270,41 @@ public class PmsPatientServiceImpl implements PmsPatientService {
         }
     }
 
+    @Override
+    public void importPatient1(MultipartFile file) throws IOException {
+        //读取excel
+        List<PmsPatient> pmsPatientList = CollectionUtil.newArrayList();
+        ExcelUtil.readBySax(file.getInputStream(), 0, (sheetIndex, rowIndex, rowList) -> {
+            //中铝新材料有限公司电解厂2024年度职工健康体检统计表（非高温）
+            //序号	姓名	性别	出生日期	身份证号	婚姻状况	联系电话	部门	工号	工种	民族	国籍		防护措施	总工龄(年)	总工龄(月)	接害工龄(年)	接害工龄(月)			体检类别
+            try {
+                if (rowIndex < 4) {
+                    return;
+                }
+                PmsPatient patient = new PmsPatient();
+                patient.setName(rowList.get(1).toString() + "-" + rowList.get(2).toString());
+                patient.setGender(rowList.get(3).toString().trim().equals("男") ? (byte) 0 : (byte) 1);
+                patient.setPinyinFull(PinyinUtil.getPinyin(rowList.get(2).toString(), ""));
+                patient.setPinyinSimple(PinyinUtil.getFirstLetter(rowList.get(2).toString(), ""));
+                patient.setBirthDate(DateUtil.parse(rowList.get(4).toString()));
+                patient.setCreateBy(SecurityUtils.getUsername());
+                patient.setId(IdUtil.getSnowflakeNextId());
+                patient.setTenantId(SecurityUtils.getTenantId());
+                patient.setDelFlag((byte) 0);
+                patient.setCreateTime(new Date());
+                pmsPatientList.add(patient);
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new BaseException(StrUtil.format("导入患者信息错误：sheet:{},row:{}, {}",
+                        sheetIndex + 1, rowIndex + 1, ExceptionUtil.getExceptionMessage(e)));
+            }
+        });
+        if (CollectionUtil.isNotEmpty(pmsPatientList)) {
+            //批量插入
+            batchSave(pmsPatientList);
+        }
+    }
+
     @Override
     public List<PmsPatientVo.PatientResult> adminQuery(PmsPatientDto.PatientQuery dto) {
         return pmsPatientDao.adminQuery(dto);
@@ -310,20 +346,22 @@ public class PmsPatientServiceImpl implements PmsPatientService {
                 }
             }
             writer.writeCellValue(8, row, patientList.get(i).getIdCard());
+            writer.writeCellValue(9, row, patientList.get(i).getWeight());
+            writer.writeCellValue(10, row, patientList.get(i).getHeight());
             Integer source = patientList.get(i).getSource();
             if (source != null) {
                 switch (source) {
                     case 0:
-                        writer.writeCellValue(9, row, "筛查");
+                        writer.writeCellValue(11, row, "筛查");
                         break;
                     case 1:
-                        writer.writeCellValue(9, row, "录入");
+                        writer.writeCellValue(11, row, "录入");
                         break;
                     case 2:
-                        writer.writeCellValue(9, row, "HIS");
+                        writer.writeCellValue(11, row, "HIS");
                 }
             }
-            writer.writeCellValue(10, row, patientList.get(i).getCurrentIllnessHistory());
+            writer.writeCellValue(12, row, patientList.get(i).getCurrentIllnessHistory());
         }
         String filename = StrUtil.format("患者档案-{}.xlsx", DateUtil.date().toString("yyyyMMdd"));
 

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java

@@ -441,7 +441,7 @@ public class ScreeningServiceImpl implements IScreeningService {
         ScrScreeningDetailExample scrScreeningDetailExample = new ScrScreeningDetailExample();
         scrScreeningDetailExample.createCriteria().andDelFlagEqualTo((byte) 0).andRecordIdEqualTo(param.getDetailId())
                 .andQuestionCodeIn(CollectionUtil.newArrayList("SCWJ-NAME", "SCWJ-SEX", "SCWJ-BIRTH",
-                        "SCWJ-AGE", "SCWJ-PHONE", "SCWJ-XBS"));
+                        "SCWJ-AGE", "SCWJ-PHONE", "SCWJ-XBS", "SCWJ-HEIGHT", "SCWJ-WEIGHT"));
         List<ScrScreeningDetail> scrScreeningDetails = screeningDetailDao.selectByExample(scrScreeningDetailExample);
         if (CollectionUtil.isNotEmpty(scrScreeningDetails)) {
             Map<String, ScrScreeningDetail> map = scrScreeningDetails.stream().collect(Collectors.toMap(ScrScreeningDetail::getQuestionCode, Function.identity()));
@@ -477,6 +477,12 @@ public class ScreeningServiceImpl implements IScreeningService {
                 if (ObjectUtil.isNotNull(map.get("SCWJ-XBS-QT"))) {
                     pmsPatient.setCurrentIllnessHistory(map.get("SCWJ-XBS-QT").getAnswer());
                 }
+                if (ObjectUtil.isNotNull(map.get("SCWJ-HEIGHT"))) {
+                    pmsPatient.setHeight(map.get("SCWJ-HEIGHT").getAnswer());
+                }
+                if (ObjectUtil.isNotNull(map.get("SCWJ-WEIGHT"))) {
+                    pmsPatient.setWeight(map.get("SCWJ-WEIGHT").getAnswer());
+                }
                 pmsPatient.setSource((byte) 0);
                 pmsPatient.setDelFlag((byte) 0);
                 pmsPatient.setCreateTime(new Date());

acupuncture-system/src/main/resources/mapper/dao/PmsPatientDao.xml

@@ -21,6 +21,8 @@
         p.tenant_id as tenantId,
         p.create_by as createBy,
         p.create_time as createTime,
+        p.weight,
+        p.height,
         t.name as tenantName
         FROM
         pms_patient p
@@ -83,6 +85,8 @@
         p.tenant_id as tenantId,
         p.create_by as createBy,
         p.create_time as createTime,
+        p.weight,
+        p.height,
         t.name as tenantName
         FROM
         v_pms_patient p
@@ -140,6 +144,7 @@
             id_card_type,
             id_card,
             source,
+        tenant_id,
             current_illness_history,
             create_by,
             create_time
@@ -159,6 +164,7 @@
             #{patient.idCardType},
             #{patient.idCard},
             #{patient.source},
+            #{patient.tenantId},
             #{patient.currentIllnessHistory},
             #{patient.createBy},
             #{patient.createTime}

acupuncture-system/src/main/resources/mapper/system/PmsPatientMapper.xml

@@ -15,7 +15,8 @@
     <result column="id_card" jdbcType="VARCHAR" property="idCard" />
     <result column="source" jdbcType="TINYINT" property="source" />
     <result column="current_illness_history" jdbcType="VARCHAR" property="currentIllnessHistory" />
-    <result column="current_illness_history_qt" jdbcType="VARCHAR" property="currentIllnessHistoryQt" />
+    <result column="weight" jdbcType="VARCHAR" property="weight" />
+    <result column="height" jdbcType="VARCHAR" property="height" />
     <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
@@ -23,6 +24,7 @@
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="current_illness_history_qt" jdbcType="VARCHAR" property="currentIllnessHistoryQt" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -84,8 +86,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, name, pinyin_full, pinyin_simple, gender, birth_date, ethnicity, education_years, 
-    phone, id_card_type, id_card, source, current_illness_history, current_illness_history_qt, 
+    phone, id_card_type, id_card, source, current_illness_history, weight, height, del_flag, 
-    del_flag, tenant_id, create_by, create_time, update_by, update_time, remark
+    tenant_id, create_by, create_time, update_by, update_time, remark, current_illness_history_qt
   </sql>
   <select id="selectByExample" parameterType="com.acupuncture.system.domain.po.PmsPatientExample" resultMap="BaseResultMap">
     select
@@ -116,18 +118,18 @@
       pinyin_simple, gender, birth_date, 
       ethnicity, education_years, phone, 
       id_card_type, id_card, source, 
-      current_illness_history, current_illness_history_qt, 
+      current_illness_history, weight, height, 
       del_flag, tenant_id, create_by, 
       create_time, update_by, update_time, 
-      remark)
+      remark, current_illness_history_qt)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{pinyinFull,jdbcType=VARCHAR}, 
       #{pinyinSimple,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, #{birthDate,jdbcType=DATE}, 
       #{ethnicity,jdbcType=VARCHAR}, #{educationYears,jdbcType=INTEGER}, #{phone,jdbcType=VARCHAR}, 
       #{idCardType,jdbcType=TINYINT}, #{idCard,jdbcType=VARCHAR}, #{source,jdbcType=TINYINT}, 
-      #{currentIllnessHistory,jdbcType=VARCHAR}, #{currentIllnessHistoryQt,jdbcType=VARCHAR}, 
+      #{currentIllnessHistory,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR}, #{height,jdbcType=VARCHAR}, 
       #{delFlag,jdbcType=TINYINT}, #{tenantId,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{remark,jdbcType=VARCHAR})
+      #{remark,jdbcType=VARCHAR}, #{currentIllnessHistoryQt,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.PmsPatient">
     insert into pms_patient
@@ -171,8 +173,11 @@
       <if test="currentIllnessHistory != null">
         current_illness_history,
       </if>
-      <if test="currentIllnessHistoryQt != null">
+      <if test="weight != null">
-        current_illness_history_qt,
+        weight,
+      </if>
+      <if test="height != null">
+        height,
       </if>
       <if test="delFlag != null">
         del_flag,
@@ -195,6 +200,9 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="currentIllnessHistoryQt != null">
+        current_illness_history_qt,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -236,8 +244,11 @@
       <if test="currentIllnessHistory != null">
         #{currentIllnessHistory,jdbcType=VARCHAR},
       </if>
-      <if test="currentIllnessHistoryQt != null">
+      <if test="weight != null">
-        #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+        #{weight,jdbcType=VARCHAR},
+      </if>
+      <if test="height != null">
+        #{height,jdbcType=VARCHAR},
       </if>
       <if test="delFlag != null">
         #{delFlag,jdbcType=TINYINT},
@@ -260,6 +271,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="currentIllnessHistoryQt != null">
+        #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.acupuncture.system.domain.po.PmsPatientExample" resultType="java.lang.Long">
@@ -310,8 +324,11 @@
       <if test="record.currentIllnessHistory != null">
         current_illness_history = #{record.currentIllnessHistory,jdbcType=VARCHAR},
       </if>
-      <if test="record.currentIllnessHistoryQt != null">
+      <if test="record.weight != null">
-        current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR},
+        weight = #{record.weight,jdbcType=VARCHAR},
+      </if>
+      <if test="record.height != null">
+        height = #{record.height,jdbcType=VARCHAR},
       </if>
       <if test="record.delFlag != null">
         del_flag = #{record.delFlag,jdbcType=TINYINT},
@@ -334,6 +351,9 @@
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.currentIllnessHistoryQt != null">
+        current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -354,14 +374,16 @@
       id_card = #{record.idCard,jdbcType=VARCHAR},
       source = #{record.source,jdbcType=TINYINT},
       current_illness_history = #{record.currentIllnessHistory,jdbcType=VARCHAR},
-      current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR},
+      weight = #{record.weight,jdbcType=VARCHAR},
+      height = #{record.height,jdbcType=VARCHAR},
       del_flag = #{record.delFlag,jdbcType=TINYINT},
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      remark = #{record.remark,jdbcType=VARCHAR}
+      remark = #{record.remark,jdbcType=VARCHAR},
+      current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -405,8 +427,11 @@
       <if test="currentIllnessHistory != null">
         current_illness_history = #{currentIllnessHistory,jdbcType=VARCHAR},
       </if>
-      <if test="currentIllnessHistoryQt != null">
+      <if test="weight != null">
-        current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+        weight = #{weight,jdbcType=VARCHAR},
+      </if>
+      <if test="height != null">
+        height = #{height,jdbcType=VARCHAR},
       </if>
       <if test="delFlag != null">
         del_flag = #{delFlag,jdbcType=TINYINT},
@@ -429,6 +454,9 @@
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="currentIllnessHistoryQt != null">
+        current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -446,14 +474,16 @@
       id_card = #{idCard,jdbcType=VARCHAR},
       source = #{source,jdbcType=TINYINT},
       current_illness_history = #{currentIllnessHistory,jdbcType=VARCHAR},
-      current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+      weight = #{weight,jdbcType=VARCHAR},
+      height = #{height,jdbcType=VARCHAR},
       del_flag = #{delFlag,jdbcType=TINYINT},
       tenant_id = #{tenantId,jdbcType=BIGINT},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      remark = #{remark,jdbcType=VARCHAR}
+      remark = #{remark,jdbcType=VARCHAR},
+      current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>