Merge branch 'develop_znwz_zzcx_xlcs' into 122run

zzcx-service/src/main/java/com/diagbot/dto/GetInquiryDTO.java

@@ -14,6 +14,8 @@ import java.util.List;
 @Setter
 public class GetInquiryDTO {
 
+    private Long id;
+
     /**
      * 医院名称
      */
@@ -59,6 +61,11 @@ public class GetInquiryDTO {
      */
     private String diagnosis;
 
+    /**
+     * 数据版本
+     */
+    private String remark;
+
 
     private List<GetInquiryDetailDTO> inquiryDetailDTOS;
 }

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

@@ -161,25 +161,30 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     public GetInquiryDTO getInquiry(GetInquiryVO getInquiryVO) {
         GetInquiryDTO getInquiryDTO = new GetInquiryDTO();
         InquiryInfo inquiryInfo = null;
-        if (StringUtil.isNotBlank(getInquiryVO.getInquiryCode())) {
-             inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
+
+        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("inquiry_code", getInquiryVO.getInquiryCode())
+                    .eq("id_type", getInquiryVO.getIdType())
+                    .eq("id_num", getInquiryVO.getIdNum())
+                    .eq(StringUtil.isNotBlank(getInquiryVO.getRemark()), "remark", getInquiryVO.getRemark())
                     .orderByDesc("gmt_modified"), false
             );
         }
+
         if (inquiryInfo == null) {
-            if (getInquiryVO.getIdType() != null && StringUtil.isNotBlank(getInquiryVO.getIdNum())) {
-                inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
+            if (StringUtil.isNotBlank(getInquiryVO.getInquiryCode())) {
+                 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())
+                        .eq("inquiry_code", getInquiryVO.getInquiryCode())
+                        .eq(StringUtil.isNotBlank(getInquiryVO.getRemark()), "remark", getInquiryVO.getRemark())
                         .orderByDesc("gmt_modified"), false
                 );
             }
         }
+
         if (null != inquiryInfo) {
             BeanUtil.copyProperties(inquiryInfo, getInquiryDTO);
             List<InquiryDetail> list = inquiryDetailFacade.list(new QueryWrapper<InquiryDetail>()
@@ -312,20 +317,20 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             saveInquiry2VO.setHospitalCode("邵逸夫医院");
         }
         Date now = DateUtil.now();
-        String dateStr = DateUtil.formatDate(now);
-        InquiryInfo inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_code", saveInquiry2VO.getHospitalCode())
-                .eq("id_type", saveInquiry2VO.getIdType())
-                .eq("id_num", saveInquiry2VO.getIdNum())
-                .eq("source", saveInquiry2VO.getSource())
-                .apply("date_format(gmt_create, '%Y-%m-%d')={0}", dateStr)
-                .orderByDesc("gmt_modified"), false
-        );
-        // 已填写
-        if (inquiryInfo != null) {
-            return inquiryInfo.getId();
-        }
+//        String dateStr = DateUtil.formatDate(now);
+//        InquiryInfo inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
+//                .eq("is_deleted", IsDeleteEnum.N.getKey())
+//                .eq("hospital_code", saveInquiry2VO.getHospitalCode())
+//                .eq("id_type", saveInquiry2VO.getIdType())
+//                .eq("id_num", saveInquiry2VO.getIdNum())
+//                .eq("source", saveInquiry2VO.getSource())
+//                .apply("date_format(gmt_create, '%Y-%m-%d')={0}", dateStr)
+//                .orderByDesc("gmt_modified"), false
+//        );
+//        // 已填写
+//        if (inquiryInfo != null) {
+//            return inquiryInfo.getId();
+//        }
         // 未填写，保存主表
         InquiryInfo inquiryInfoSave = new InquiryInfo();
         BeanUtil.copyProperties(saveInquiry2VO, inquiryInfoSave);

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

@@ -35,4 +35,9 @@ public class GetInquiryVO {
      */
     private String idNum;
 
+    /**
+     * 数据版本
+     */
+    private String remark;
+
 }