保存信息优化

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

@@ -170,13 +170,15 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             );
         }
         if (inquiryInfo == null) {
-             inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_code", getInquiryVO.getHospitalCode())
-                    .eq("id_type", getInquiryVO.getIdType())
-                    .eq("id_num", getInquiryVO.getIdNum())
-                    .orderByDesc("gmt_modified"), false
-            );
+            if (getInquiryVO.getIdType() != null && StringUtil.isNotBlank(getInquiryVO.getIdNum())) {
+                inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("hospital_code", getInquiryVO.getHospitalCode())
+                        .eq("id_type", getInquiryVO.getIdType())
+                        .eq("id_num", getInquiryVO.getIdNum())
+                        .orderByDesc("gmt_modified"), false
+                );
+            }
         }
         if (null != inquiryInfo) {
             BeanUtil.copyProperties(inquiryInfo, getInquiryDTO);
@@ -323,11 +325,11 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         // 未填写，保存主表
         InquiryInfo inquiryInfoSave = new InquiryInfo();
         BeanUtil.copyProperties(saveInquiry2VO, inquiryInfoSave);
-        inquiryInfo.setGmtCreate(now);
-        inquiryInfo.setGmtModified(now);
-        inquiryInfo.setIp(HttpUtils.getIpAddress());
-        inquiryInfo.setRemark("DV_B");
-        save(inquiryInfo);
+        inquiryInfoSave.setGmtCreate(now);
+        inquiryInfoSave.setGmtModified(now);
+        inquiryInfoSave.setIp(HttpUtils.getIpAddress());
+        inquiryInfoSave.setRemark("DV_B");
+        save(inquiryInfoSave);
 
         // 保存明细表
         Long id = inquiryInfoSave.getId();

zzcx-service/src/main/java/com/diagbot/vo/SaveInquiry2VO.java

@@ -26,7 +26,7 @@ public class SaveInquiry2VO {
     @ApiModelProperty(value = "问诊明细")
     private List<SaveInquiryDetailVO> detailList;
 
-    @ApiModelProperty(value = "证件类型(1：身份证，2：护照)")
+    @ApiModelProperty(value = "证件类型(1：身份证，2：护照，3：病历号)")
     private Integer idType;
 
     @ApiModelProperty(value = "证件号")