Merge branch 'dev/zzcx20200202_init' into develop_znwz_zzcx_xlcs

config-server/src/main/resources/shared/zzcx-service-local.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-zzcx?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-zzcxtzsl?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息

zzcx-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -54,7 +54,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         }
         Date now = DateUtil.now();
         // 如果是身份证，获取性别和年龄
-        if (IdTypeEnum.IdentityCard.getKey() == saveInquiryVO.getIdType()) {
+        if (saveInquiryVO.getIdType() != null && IdTypeEnum.IdentityCard.getKey() == saveInquiryVO.getIdType()) {
             String idNum = saveInquiryVO.getIdNum();
             if (StringUtil.isNotBlank(idNum)) {
                 saveInquiryVO.setPatAge(IdCard.getAgeByIdCardAddOne(idNum));
@@ -63,14 +63,18 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         }
 
         String dateStr = DateUtil.formatDate(now);
-        InquiryInfo inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_code", saveInquiryVO.getHospitalCode())
-                .eq("pat_name", saveInquiryVO.getPatName())
-                .eq("id_type", saveInquiryVO.getIdType())
-                .eq("id_num", saveInquiryVO.getIdNum())
-                .apply("date_format(gmt_modified, '%Y-%m-%d')={0}", dateStr), false
-        );
+        InquiryInfo inquiryInfo = null;
+        if (saveInquiryVO.getIdType() != null && saveInquiryVO.getIdNum() != null && saveInquiryVO.getPatName()!= null) {
+             inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_code", saveInquiryVO.getHospitalCode())
+                    .eq("pat_name", saveInquiryVO.getPatName())
+                    .eq("id_type", saveInquiryVO.getIdType())
+                    .eq("id_num", saveInquiryVO.getIdNum())
+                    .apply("date_format(gmt_modified, '%Y-%m-%d')={0}", dateStr), false
+            );
+        }
+
         if (inquiryInfo == null) {
             inquiryInfo = new InquiryInfo();
             BeanUtil.copyProperties(saveInquiryVO, inquiryInfo);

zzcx-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -13,6 +13,7 @@
         <result column="hospital_code" property="hospitalCode" />
         <result column="diagnosis" property="diagnosis" />
         <result column="ip" property="ip" />
+        <result column="degree" property="degree" />
         <result column="remark" property="remark" />
     </resultMap>