Merge branch 'master' into 'master'

慢病优化

See merge request lighter/web-server!70

src/main/java/thyyxxk/webserver/entity/chronicDisease/CrmPatientMi.java

@@ -71,7 +71,7 @@ public class CrmPatientMi implements Serializable {
     /**
      * 证件号
      */
-    @TableId(value = "p_id", type = IdType.NONE)
+    @TableId(value = "social_no", type = IdType.NONE)
     private String socialNo;
     /**
      * 卡号

src/main/java/thyyxxk/webserver/service/chronicDisease/ChronicDiseaseService.java

@@ -166,7 +166,9 @@ public class ChronicDiseaseService {
             if(null != data && StringUtil.isBlank(crmMi.getHisZyNo())){
                 crmMi.setHisZyNo(data.getHisZyNo());
             }
-
+            if(crmMi.getBirthDate() != null){
+                crmMi.setBirthDate(DateUtil.format(DateUtil.parse(crmMi.getBirthDate(), "yyyy-MM-dd"), "yyyy-MM-dd"));
+            }
             int num = cpmDao.insert(crmMi);
             if(num == 0){
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "保存慢特病基本信息失败！");