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

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

@@ -203,6 +203,7 @@ public class ExternalController {
         if (query == null) {
             return "no person";
         }
+        query.setTitle("personInfo");
         return query;
     }
 

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

@@ -20,7 +20,7 @@
         </commentGenerator>
 
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://sd.tall.wiki:3306/acupuncture?useUnicode=true&amp;characterEncoding=UTF-8&amp;serverTimezone=GMT%2B8&amp;tinyInt1isBit=false"
+                        connectionURL="jdbc:mysql://sd.tall.wiki:3306/acupuncture_ays?useUnicode=true&amp;characterEncoding=UTF-8&amp;serverTimezone=GMT%2B8&amp;tinyInt1isBit=false"
                         userId="root"
                         password="po3OynBO[M3579p6L7)o">
             <!--仅仅查询当前库的表，不查询其他库-->
@@ -80,7 +80,7 @@
 <!--        <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_record" domainObjectName="PmsTreatmentRecord" enableDeleteByExample="false"/>-->
 <!--        <table tableName="rms_report_type" domainObjectName="RmsReportType" enableDeleteByExample="false"/>-->

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

@@ -37,6 +37,9 @@ public class PmsPatientDto {
         @ApiModelProperty("建档人")
         private String createBy;
         private String phone;
+        private String weight;
+
+        private Integer height;
     }
 
     @Data
@@ -60,6 +63,10 @@ public class PmsPatientDto {
 
         private Byte source;
 
+        private String weight;
+
+        private Integer height;
+
         private List<String> currentIllnessHistory;
         private String currentIllnessHistoryQt;
         public String getCurrentIllnessHistory() {
@@ -91,7 +98,9 @@ public class PmsPatientDto {
         private String idCard;
 
         private Byte source;
+        private String weight;
 
+        private Integer height;
         private List<String> currentIllnessHistory;
         private String currentIllnessHistoryQt;
         public String getCurrentIllnessHistory() {

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 height;
+
+    private String weight;
 
     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 getHeight() {
-        return currentIllnessHistoryQt;
+        return height;
     }
 
-    public void setCurrentIllnessHistoryQt(String currentIllnessHistoryQt) {
+    public void setHeight(String height) {
-        this.currentIllnessHistoryQt = currentIllnessHistoryQt == null ? null : currentIllnessHistoryQt.trim();
+        this.height = height == null ? null : height.trim();
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight == null ? null : weight.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(", height=").append(height);
+        sb.append(", weight=").append(weight);
         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 andHeightIsNull() {
-            addCriterion("current_illness_history_qt is null");
+            addCriterion("height is null");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtIsNotNull() {
+        public Criteria andHeightIsNotNull() {
-            addCriterion("current_illness_history_qt is not null");
+            addCriterion("height is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtEqualTo(String value) {
+        public Criteria andHeightEqualTo(String value) {
-            addCriterion("current_illness_history_qt =", value, "currentIllnessHistoryQt");
+            addCriterion("height =", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotEqualTo(String value) {
+        public Criteria andHeightNotEqualTo(String value) {
-            addCriterion("current_illness_history_qt <>", value, "currentIllnessHistoryQt");
+            addCriterion("height <>", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtGreaterThan(String value) {
+        public Criteria andHeightGreaterThan(String value) {
-            addCriterion("current_illness_history_qt >", value, "currentIllnessHistoryQt");
+            addCriterion("height >", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtGreaterThanOrEqualTo(String value) {
+        public Criteria andHeightGreaterThanOrEqualTo(String value) {
-            addCriterion("current_illness_history_qt >=", value, "currentIllnessHistoryQt");
+            addCriterion("height >=", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtLessThan(String value) {
+        public Criteria andHeightLessThan(String value) {
-            addCriterion("current_illness_history_qt <", value, "currentIllnessHistoryQt");
+            addCriterion("height <", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtLessThanOrEqualTo(String value) {
+        public Criteria andHeightLessThanOrEqualTo(String value) {
-            addCriterion("current_illness_history_qt <=", value, "currentIllnessHistoryQt");
+            addCriterion("height <=", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtLike(String value) {
+        public Criteria andHeightLike(String value) {
-            addCriterion("current_illness_history_qt like", value, "currentIllnessHistoryQt");
+            addCriterion("height like", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotLike(String value) {
+        public Criteria andHeightNotLike(String value) {
-            addCriterion("current_illness_history_qt not like", value, "currentIllnessHistoryQt");
+            addCriterion("height not like", value, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtIn(List<String> values) {
+        public Criteria andHeightIn(List<String> values) {
-            addCriterion("current_illness_history_qt in", values, "currentIllnessHistoryQt");
+            addCriterion("height in", values, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotIn(List<String> values) {
+        public Criteria andHeightNotIn(List<String> values) {
-            addCriterion("current_illness_history_qt not in", values, "currentIllnessHistoryQt");
+            addCriterion("height not in", values, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtBetween(String value1, String value2) {
+        public Criteria andHeightBetween(String value1, String value2) {
-            addCriterion("current_illness_history_qt between", value1, value2, "currentIllnessHistoryQt");
+            addCriterion("height between", value1, value2, "height");
             return (Criteria) this;
         }
 
-        public Criteria andCurrentIllnessHistoryQtNotBetween(String value1, String value2) {
+        public Criteria andHeightNotBetween(String value1, String value2) {
-            addCriterion("current_illness_history_qt not between", value1, value2, "currentIllnessHistoryQt");
+            addCriterion("height not between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNull() {
+            addCriterion("weight is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNotNull() {
+            addCriterion("weight is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEqualTo(String value) {
+            addCriterion("weight =", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotEqualTo(String value) {
+            addCriterion("weight <>", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThan(String value) {
+            addCriterion("weight >", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThanOrEqualTo(String value) {
+            addCriterion("weight >=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThan(String value) {
+            addCriterion("weight <", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThanOrEqualTo(String value) {
+            addCriterion("weight <=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLike(String value) {
+            addCriterion("weight like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotLike(String value) {
+            addCriterion("weight not like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIn(List<String> values) {
+            addCriterion("weight in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotIn(List<String> values) {
+            addCriterion("weight not in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightBetween(String value1, String value2) {
+            addCriterion("weight between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotBetween(String value1, String value2) {
+            addCriterion("weight not between", value1, value2, "weight");
             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/po/PmsTreatment.java

@@ -50,6 +50,10 @@ public class PmsTreatment implements Serializable {
 
     private Long memberId;
 
+    private Integer height;
+
+    private String weight;
+
     private Byte delFlag;
 
     private Long tenantId;
@@ -250,6 +254,22 @@ public class PmsTreatment implements Serializable {
         this.memberId = memberId;
     }
 
+    public Integer getHeight() {
+        return height;
+    }
+
+    public void setHeight(Integer height) {
+        this.height = height;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight == null ? null : weight.trim();
+    }
+
     public Byte getDelFlag() {
         return delFlag;
     }
@@ -335,6 +355,8 @@ public class PmsTreatment implements Serializable {
         sb.append(", diagnosisName=").append(diagnosisName);
         sb.append(", status=").append(status);
         sb.append(", memberId=").append(memberId);
+        sb.append(", height=").append(height);
+        sb.append(", weight=").append(weight);
         sb.append(", delFlag=").append(delFlag);
         sb.append(", tenantId=").append(tenantId);
         sb.append(", createBy=").append(createBy);

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

@@ -1622,6 +1622,136 @@ public class PmsTreatmentExample {
             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(Integer value) {
+            addCriterion("height =", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotEqualTo(Integer value) {
+            addCriterion("height <>", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThan(Integer value) {
+            addCriterion("height >", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThanOrEqualTo(Integer value) {
+            addCriterion("height >=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThan(Integer value) {
+            addCriterion("height <", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThanOrEqualTo(Integer value) {
+            addCriterion("height <=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIn(List<Integer> values) {
+            addCriterion("height in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotIn(List<Integer> values) {
+            addCriterion("height not in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightBetween(Integer value1, Integer value2) {
+            addCriterion("height between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotBetween(Integer value1, Integer value2) {
+            addCriterion("height not between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNull() {
+            addCriterion("weight is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNotNull() {
+            addCriterion("weight is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEqualTo(String value) {
+            addCriterion("weight =", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotEqualTo(String value) {
+            addCriterion("weight <>", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThan(String value) {
+            addCriterion("weight >", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThanOrEqualTo(String value) {
+            addCriterion("weight >=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThan(String value) {
+            addCriterion("weight <", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThanOrEqualTo(String value) {
+            addCriterion("weight <=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLike(String value) {
+            addCriterion("weight like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotLike(String value) {
+            addCriterion("weight not like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIn(List<String> values) {
+            addCriterion("weight in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotIn(List<String> values) {
+            addCriterion("weight not in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightBetween(String value1, String value2) {
+            addCriterion("weight between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotBetween(String value1, String value2) {
+            addCriterion("weight not between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
         public Criteria andDelFlagIsNull() {
             addCriterion("del_flag is null");
             return (Criteria) this;

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

@@ -303,6 +303,10 @@ public class ExternalVo {
             return Sex;
         }
 
+        public void setTitle(String title) {
+            Title = title;
+        }
+
         @JsonProperty("Height")
         public String getHeight() {
             return Height;

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/persist/dao/ExternalDao.java

@@ -32,7 +32,7 @@ public interface ExternalDao {
     /**
      * 查询是否已有主测试记录
      */
-    ExternalVo.UserInfo motionQueryMemberInfo(@Param("memberid") String memberid,
+    List<ExternalVo.UserInfo> motionQueryMemberInfo(@Param("memberid") String memberid,
                                               @Param("testData")Date testData,
                                               @Param("Title") String Title);
 

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

@@ -233,12 +233,14 @@ public class ExternalServiceImpl implements ExternalService {
     @Override
     public int motionAdd(ExternalDto.RtcfInfo rtcfInfoDto) {
         //查询今日是否已有测试数据， 如有则删除后新增
-        ExternalVo.UserInfo userInfo = externalDao.motionQueryMemberInfo(rtcfInfoDto.getUID(), DateUtil.parse(rtcfInfoDto.getTestDate(), "yyyy-MM-dd"), rtcfInfoDto.getTitle());
+        List<ExternalVo.UserInfo> userInfos = externalDao.motionQueryMemberInfo(rtcfInfoDto.getUID(), DateUtil.parse(rtcfInfoDto.getTestDate(), "yyyy-MM-dd"), rtcfInfoDto.getTitle());
-        if (userInfo != null) {
+        if (CollectionUtil.isNotEmpty(userInfos)) {
             //删除数据
-            externalDao.delMain(userInfo.getUID(), "CURRENT_FIT_DATA");
+            for (ExternalVo.UserInfo userInfo : userInfos) {
-            externalDao.delData(userInfo.getTestID());
+                externalDao.delMain(userInfo.getUID(), "CURRENT_FIT_DATA");
-            externalDao.delAdvice(userInfo.getTestID());
+                externalDao.delData(userInfo.getTestID());
+                externalDao.delAdvice(userInfo.getTestID());
+            }
         }
 
         ExternalDto.RtcfInfo.Advice advice = rtcfInfoDto.getAdvice();
@@ -259,12 +261,14 @@ public class ExternalServiceImpl implements ExternalService {
     @Override
     public int motionAddTcf(ExternalDto.BcaData bcaData) {
         //查询今日是否已有测试数据， 如有则删除后新增
-        ExternalVo.UserInfo userInfo = externalDao.motionQueryMemberInfo(bcaData.getUID(), DateUtil.parse(bcaData.getTestDate(), "yyyy-MM-dd"), bcaData.getTitle());
+        List<ExternalVo.UserInfo> userInfos = externalDao.motionQueryMemberInfo(bcaData.getUID(), DateUtil.parse(bcaData.getTestDate(), "yyyy-MM-dd"), bcaData.getTitle());
-        if (userInfo != null) {
+        if (CollectionUtil.isNotEmpty(userInfos)) {
             //删除数据
-            externalDao.delMain(userInfo.getUID(), "CURRENT_BCA_DATA");
+            for (ExternalVo.UserInfo userInfo : userInfos) {
-            externalDao.delRecord(userInfo.getUID());
+                externalDao.delMain(userInfo.getUID(), "CURRENT_BCA_DATA");
-            externalDao.delBcaAdvice(userInfo.getUID());
+                externalDao.delRecord(userInfo.getUID());
+                externalDao.delBcaAdvice(userInfo.getUID());
+            }
         }
 
         if (bcaData.getData() != null) {

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/dao/ExternalDao.xml

@@ -104,9 +104,9 @@
             <if test="memberid != null and memberid != ''">
                 and t.UID = #{memberid}
             </if>
-            <if test="testData != null">
+<!--            <if test="testData != null">-->
-                and t.TestDate = #{testData}
+<!--                and t.TestDate = #{testData}-->
-            </if>
+<!--            </if>-->
             <if test="Title != null">
                 and t.Title = #{Title}
             </if>

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

@@ -21,7 +21,9 @@
         p.tenant_id as tenantId,
         p.create_by as createBy,
         p.create_time as createTime,
-        t.name as tenantName
+        t.name as tenantName,
+        p. weight,
+        p.height
         FROM
         pms_patient p
         left join

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="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" />
     <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, height, weight, 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, height, weight, 
       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}, #{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})
+      #{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="height != null">
-        current_illness_history_qt,
+        height,
+      </if>
+      <if test="weight != null">
+        weight,
       </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="height != null">
-        #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+        #{height,jdbcType=VARCHAR},
+      </if>
+      <if test="weight != null">
+        #{weight,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.height != null">
-        current_illness_history_qt = #{record.currentIllnessHistoryQt,jdbcType=VARCHAR},
+        height = #{record.height,jdbcType=VARCHAR},
+      </if>
+      <if test="record.weight != null">
+        weight = #{record.weight,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},
+      height = #{record.height,jdbcType=VARCHAR},
+      weight = #{record.weight,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="height != null">
-        current_illness_history_qt = #{currentIllnessHistoryQt,jdbcType=VARCHAR},
+        height = #{height,jdbcType=VARCHAR},
+      </if>
+      <if test="weight != null">
+        weight = #{weight,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},
+      height = #{height,jdbcType=VARCHAR},
+      weight = #{weight,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>

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

@@ -25,6 +25,8 @@
     <result column="diagnosis_name" jdbcType="VARCHAR" property="diagnosisName" />
     <result column="status" jdbcType="TINYINT" property="status" />
     <result column="member_id" jdbcType="BIGINT" property="memberId" />
+    <result column="height" jdbcType="INTEGER" 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" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
@@ -95,7 +97,8 @@
     id, patient_id, name, pinyin_full, pinyin_simple, gender, age, birth_date, ethnicity, 
     education_years, phone, id_card_type, id_card, visit_type, visit_number, visit_time, 
     discharge_time, doctor, dept_name, diagnosis_code, diagnosis_name, status, member_id, 
-    del_flag, tenant_id, create_by, create_time, update_by, update_time, remark
+    height, weight, del_flag, tenant_id, create_by, create_time, update_by, update_time, 
+    remark
   </sql>
   <select id="selectByExample" parameterType="com.acupuncture.system.domain.po.PmsTreatmentExample" resultMap="BaseResultMap">
     select
@@ -129,10 +132,10 @@
       id_card, visit_type, visit_number, 
       visit_time, discharge_time, doctor, 
       dept_name, diagnosis_code, diagnosis_name, 
-      status, member_id, del_flag, 
+      status, member_id, height, 
-      tenant_id, create_by, create_time, 
+      weight, del_flag, tenant_id, 
-      update_by, update_time, remark
+      create_by, create_time, update_by, 
-      )
+      update_time, remark)
     values (#{id,jdbcType=BIGINT}, #{patientId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
       #{pinyinFull,jdbcType=VARCHAR}, #{pinyinSimple,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, 
       #{age,jdbcType=INTEGER}, #{birthDate,jdbcType=DATE}, #{ethnicity,jdbcType=VARCHAR}, 
@@ -140,10 +143,10 @@
       #{idCard,jdbcType=VARCHAR}, #{visitType,jdbcType=TINYINT}, #{visitNumber,jdbcType=VARCHAR}, 
       #{visitTime,jdbcType=TIMESTAMP}, #{dischargeTime,jdbcType=TIMESTAMP}, #{doctor,jdbcType=VARCHAR}, 
       #{deptName,jdbcType=VARCHAR}, #{diagnosisCode,jdbcType=VARCHAR}, #{diagnosisName,jdbcType=VARCHAR}, 
-      #{status,jdbcType=TINYINT}, #{memberId,jdbcType=BIGINT}, #{delFlag,jdbcType=TINYINT}, 
+      #{status,jdbcType=TINYINT}, #{memberId,jdbcType=BIGINT}, #{height,jdbcType=INTEGER}, 
-      #{tenantId,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{weight,jdbcType=VARCHAR}, #{delFlag,jdbcType=TINYINT}, #{tenantId,jdbcType=BIGINT}, 
-      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
-      )
+      #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.acupuncture.system.domain.po.PmsTreatment">
     insert into pms_treatment
@@ -217,6 +220,12 @@
       <if test="memberId != null">
         member_id,
       </if>
+      <if test="height != null">
+        height,
+      </if>
+      <if test="weight != null">
+        weight,
+      </if>
       <if test="delFlag != null">
         del_flag,
       </if>
@@ -309,6 +318,12 @@
       <if test="memberId != null">
         #{memberId,jdbcType=BIGINT},
       </if>
+      <if test="height != null">
+        #{height,jdbcType=INTEGER},
+      </if>
+      <if test="weight != null">
+        #{weight,jdbcType=VARCHAR},
+      </if>
       <if test="delFlag != null">
         #{delFlag,jdbcType=TINYINT},
       </if>
@@ -410,6 +425,12 @@
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=BIGINT},
       </if>
+      <if test="record.height != null">
+        height = #{record.height,jdbcType=INTEGER},
+      </if>
+      <if test="record.weight != null">
+        weight = #{record.weight,jdbcType=VARCHAR},
+      </if>
       <if test="record.delFlag != null">
         del_flag = #{record.delFlag,jdbcType=TINYINT},
       </if>
@@ -461,6 +482,8 @@
       diagnosis_name = #{record.diagnosisName,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=TINYINT},
       member_id = #{record.memberId,jdbcType=BIGINT},
+      height = #{record.height,jdbcType=INTEGER},
+      weight = #{record.weight,jdbcType=VARCHAR},
       del_flag = #{record.delFlag,jdbcType=TINYINT},
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
       create_by = #{record.createBy,jdbcType=VARCHAR},
@@ -541,6 +564,12 @@
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=BIGINT},
       </if>
+      <if test="height != null">
+        height = #{height,jdbcType=INTEGER},
+      </if>
+      <if test="weight != null">
+        weight = #{weight,jdbcType=VARCHAR},
+      </if>
       <if test="delFlag != null">
         del_flag = #{delFlag,jdbcType=TINYINT},
       </if>
@@ -589,6 +618,8 @@
       diagnosis_name = #{diagnosisName,jdbcType=VARCHAR},
       status = #{status,jdbcType=TINYINT},
       member_id = #{memberId,jdbcType=BIGINT},
+      height = #{height,jdbcType=INTEGER},
+      weight = #{weight,jdbcType=VARCHAR},
       del_flag = #{delFlag,jdbcType=TINYINT},
       tenant_id = #{tenantId,jdbcType=BIGINT},
       create_by = #{createBy,jdbcType=VARCHAR},