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

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

@@ -11,9 +11,11 @@ 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;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -42,13 +44,14 @@ public class LEA0147 extends QCCatalogue {
                 List<Diag> diags = leaveDiagLabel.getDiags();
                 Map<String, Map<String, String>> hospitalDiagMap = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
                 if (ListUtil.isNotEmpty(diags) && hospitalDiagMap != null) {
-                    long count = diags.stream().filter(i -> {
-                        if (i != null && StringUtil.isNotBlank(i.getHospitalDiagName())) {
-                            return hospitalDiagMap.get(i.getHospitalDiagName()) == null;
+                    List<String> diagnames = new ArrayList<>();
+                    for (Diag dg:diags) {
+                        if (hospitalDiagMap.get(dg.getHospitalDiagName())==null) {
+                            diagnames.add(dg.getHospitalDiagName());
                         }
-                        return false;
-                    }).count();
-                    if (count > 0) {
+                    }
+                    if (diagnames.size()>0) {
+                        info.set(StringUtils.join(diagnames.toArray(), ","));
                         status.set("-1");
                     }
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0330.java

@@ -30,7 +30,7 @@ public class PRE0330 extends QCCatalogue {
             if (operationDoc.getPreoperativeDiscussionDoc() != null) {
                 Map<String, String> structureMap = operationDoc.getPreoperativeDiscussionDoc().getStructureMap();
                 if(structureMap != null
-                        && structureMap.get("拟施手术方式、名称及可能的变更与禁忌征 ") != null){
+                        && structureMap.get("拟施手术方式名称及可能的变更与禁忌症") != null){
                     return;
                 }
                 if (StringUtil.isEmpty(structureMap.get("拟行术式")) && StringUtil.isEmpty(structureMap.get("可能的变更"))) {

trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -74,7 +74,8 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "家庭住址++++现住址=现住址",
             "产次++++产=产次",
             "家长姓名++++家长=家长姓名",
-            "职业++++首页职业新=职业"
+            "职业++++首页职业新=职业",
+            "签名时间++++修正签名时间=修正签名时间"
     );
 
     private String concatString(String item) {

trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java

@@ -234,7 +234,8 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "手术并发症=",
             "失血量=",
             "手术经过=",
-            "记录时间="
+            "记录时间=",
+            "风险评估分值=手术风险评估"
     );
 
 
@@ -328,7 +329,8 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "术前准备++++术前准备情况=",
             "手术风险及预防措施++++文本框=可能意外和防范措施",
             "术中注意事项=术前术后注意事项",
-            "术后注意事项="
+            "术后注意事项=",
+            "拟施手术方式、名称及可能的变更与禁忌征=拟施手术方式名称及可能的变更与禁忌症"
     );