Merge remote-tracking branch 'origin/dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0147.java

@@ -10,7 +10,6 @@ import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.model.entity.Diag;
 import com.lantone.qc.pub.model.label.DiagLabel;
 import com.lantone.qc.pub.util.ListUtil;
-import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -32,9 +31,9 @@ public class LEA0147 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
         LeaveHospitalDoc leaveHospitalDoc = inputInfo.getLeaveHospitalDoc();
         if (leaveHospitalDoc == null) {
-            status.set("0");
             return;
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
@@ -45,15 +44,15 @@ public class LEA0147 extends QCCatalogue {
                 Map<String, Map<String, String>> hospitalDiagMap = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
                 if (ListUtil.isNotEmpty(diags) && hospitalDiagMap != null) {
                     List<String> diagnames = new ArrayList<>();
-                    for (Diag dg:diags) {
-                        if ("其他的".equals(dg.getHospitalDiagName())){
+                    for (Diag dg : diags) {
+                        if ("其他的".equals(dg.getHospitalDiagName())) {
                             continue;
                         }
-                        if (hospitalDiagMap.get(dg.getHospitalDiagName())==null) {
+                        if (hospitalDiagMap.get(dg.getHospitalDiagName()) == null) {
                             diagnames.add(dg.getHospitalDiagName());
                         }
                     }
-                    if (diagnames.size()>0) {
+                    if (diagnames.size() > 0) {
                         info.set(StringUtils.join(diagnames.toArray(), ","));
                         status.set("-1");
                     }

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * @ClassName : THR0134
- * @Description : 上级医师（主治医师）首次查房无补充诊断/初步诊断/修正诊断
+ * @Description : 上级医师（主治医师）首次查房无初步诊断
  * @Author : 胡敬
  * @Date: 2020-03-23 14:16
  */