1.每周无2/3次查房规则修改bug

2.无会诊记录修改判断逻辑

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0528.java

@@ -1,20 +1,14 @@
 package com.lantone.qc.kernel.catalogue.consultation;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationApplicationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationRecordDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ClassName : CON0528
@@ -25,13 +19,13 @@ import java.util.Map;
 @Component
 public class CON0528 extends QCCatalogue {
 
-    public void start(InputInfo inputInfo, OutputInfo outputInfo)throws ParseException {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
         List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if(consultationDocs.size()>0){
-            for (ConsultationDoc consulation:consultationDocs) {
+        if (consultationDocs.size() > 0) {
+            for (ConsultationDoc consulation : consultationDocs) {
                 ConsultationRecordDoc consultationRecordDoc = consulation.getConsultationRecordDoc();
-                if(consultationRecordDoc == null || CatalogueUtil.isEmpty(consultationRecordDoc.getText())){
+                if (consultationRecordDoc == null) {
                     status.set("-1");
                     break;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0127.java

@@ -46,7 +46,7 @@ public class THR0127 extends QCCatalogue {
 
             ThreeLevelWardDoc threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);
             List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDoc.getAllDoctorWradDocs();
-            if (allDoctorWradDocs.size() == 0){
+            if (allDoctorWradDocs.size() == 0) {
                 status.set("0");
                 return;
             }
@@ -119,10 +119,9 @@ public class THR0127 extends QCCatalogue {
             }
             if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, Long.valueOf(duration))) {
                 String title = threeLevelWardStructureMap.get("查房标题");
-                if (StringUtil.isNotBlank(title)) {
-                    recordTitle += title + ",";
-                    dateList.add(recordDate);
-                }
+                title = StringUtil.isNotBlank(title) ? title : "";
+                recordTitle += title + ",";
+                dateList.add(recordDate);
             }
         }
         if (dateList.size() > 0) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0128.java

@@ -53,7 +53,7 @@ public class THR0128 extends QCCatalogue {
 
             ThreeLevelWardDoc threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);
             List<ThreeLevelWardDoc> allDoctorWradDocs = threeLevelWardDoc.getAllDoctorWradDocs();
-            if (allDoctorWradDocs.size() == 0){
+            if (allDoctorWradDocs.size() == 0) {
                 status.set("0");
                 return;
             }
@@ -139,10 +139,9 @@ public class THR0128 extends QCCatalogue {
             }
             if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, Long.valueOf(duration))) {
                 String title = threeLevelWardStructureMap.get("查房标题");
-                if (StringUtil.isNotBlank(title)) {
-                    recordTitle += title + ",";
-                    dateList.add(recordDate);
-                }
+                title = StringUtil.isNotBlank(title) ? title : "";
+                recordTitle += title + ",";
+                dateList.add(recordDate);
             }
         }
         if (dateList.size() > 0) {