患者档案添加身高体重

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

@@ -30,7 +30,7 @@ public class PmsPatient implements Serializable {
 
     private String currentIllnessHistory;
 
-    private Integer height;
+    private String height;
 
     private String weight;
 
@@ -156,12 +156,12 @@ public class PmsPatient implements Serializable {
         this.currentIllnessHistory = currentIllnessHistory == null ? null : currentIllnessHistory.trim();
     }
 
-    public Integer getHeight() {
+    public String getHeight() {
         return height;
     }
 
-    public void setHeight(Integer height) {
+    public void setHeight(String height) {
-        this.height = height;
+        this.height = height == null ? null : height.trim();
     }
 
     public String getWeight() {

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

@@ -992,52 +992,62 @@ public class PmsPatientExample {
             return (Criteria) this;
         }
 
-        public Criteria andHeightEqualTo(Integer value) {
+        public Criteria andHeightEqualTo(String value) {
             addCriterion("height =", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andHeightNotEqualTo(Integer value) {
+        public Criteria andHeightNotEqualTo(String value) {
             addCriterion("height <>", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andHeightGreaterThan(Integer value) {
+        public Criteria andHeightGreaterThan(String value) {
             addCriterion("height >", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andHeightGreaterThanOrEqualTo(Integer value) {
+        public Criteria andHeightGreaterThanOrEqualTo(String value) {
             addCriterion("height >=", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andHeightLessThan(Integer value) {
+        public Criteria andHeightLessThan(String value) {
             addCriterion("height <", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andHeightLessThanOrEqualTo(Integer value) {
+        public Criteria andHeightLessThanOrEqualTo(String value) {
             addCriterion("height <=", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andHeightIn(List<Integer> values) {
+        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<Integer> values) {
+        public Criteria andHeightNotIn(List<String> values) {
             addCriterion("height not in", values, "height");
             return (Criteria) this;
         }
 
-        public Criteria andHeightBetween(Integer value1, Integer value2) {
+        public Criteria andHeightBetween(String value1, String value2) {
             addCriterion("height between", value1, value2, "height");
             return (Criteria) this;
         }
 
-        public Criteria andHeightNotBetween(Integer value1, Integer value2) {
+        public Criteria andHeightNotBetween(String value1, String value2) {
             addCriterion("height not between", value1, value2, "height");
             return (Criteria) this;
         }

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/impl/ScreeningServiceImpl.java

@@ -477,6 +477,13 @@ 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/system/PmsPatientMapper.xml

@@ -15,7 +15,7 @@
     <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="height" jdbcType="INTEGER" property="height" />
+    <result column="height" jdbcType="VARCHAR" property="height" />
     <result column="weight" jdbcType="VARCHAR" property="weight" />
     <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
@@ -126,7 +126,7 @@
       #{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}, #{height,jdbcType=INTEGER}, #{weight,jdbcType=VARCHAR}, 
+      #{currentIllnessHistory,jdbcType=VARCHAR}, #{height,jdbcType=VARCHAR}, #{weight,jdbcType=VARCHAR}, 
       #{delFlag,jdbcType=TINYINT}, #{tenantId,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{remark,jdbcType=VARCHAR}, #{currentIllnessHistoryQt,jdbcType=VARCHAR})
@@ -245,7 +245,7 @@
         #{currentIllnessHistory,jdbcType=VARCHAR},
       </if>
       <if test="height != null">
-        #{height,jdbcType=INTEGER},
+        #{height,jdbcType=VARCHAR},
       </if>
       <if test="weight != null">
         #{weight,jdbcType=VARCHAR},
@@ -325,7 +325,7 @@
         current_illness_history = #{record.currentIllnessHistory,jdbcType=VARCHAR},
       </if>
       <if test="record.height != null">
-        height = #{record.height,jdbcType=INTEGER},
+        height = #{record.height,jdbcType=VARCHAR},
       </if>
       <if test="record.weight != null">
         weight = #{record.weight,jdbcType=VARCHAR},
@@ -374,7 +374,7 @@
       id_card = #{record.idCard,jdbcType=VARCHAR},
       source = #{record.source,jdbcType=TINYINT},
       current_illness_history = #{record.currentIllnessHistory,jdbcType=VARCHAR},
-      height = #{record.height,jdbcType=INTEGER},
+      height = #{record.height,jdbcType=VARCHAR},
       weight = #{record.weight,jdbcType=VARCHAR},
       del_flag = #{record.delFlag,jdbcType=TINYINT},
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
@@ -428,7 +428,7 @@
         current_illness_history = #{currentIllnessHistory,jdbcType=VARCHAR},
       </if>
       <if test="height != null">
-        height = #{height,jdbcType=INTEGER},
+        height = #{height,jdbcType=VARCHAR},
       </if>
       <if test="weight != null">
         weight = #{weight,jdbcType=VARCHAR},
@@ -474,7 +474,7 @@
       id_card = #{idCard,jdbcType=VARCHAR},
       source = #{source,jdbcType=TINYINT},
       current_illness_history = #{currentIllnessHistory,jdbcType=VARCHAR},
-      height = #{height,jdbcType=INTEGER},
+      height = #{height,jdbcType=VARCHAR},
       weight = #{weight,jdbcType=VARCHAR},
       del_flag = #{delFlag,jdbcType=TINYINT},
       tenant_id = #{tenantId,jdbcType=BIGINT},