hujing 5 лет назад
Родитель
Сommit
6e5daaf274

+ 11 - 7
kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0309.java

@@ -6,11 +6,9 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.ClinicBloodEffectDoc;
 import com.lantone.qc.pub.model.doc.ClinicalBloodDoc;
 import com.lantone.qc.pub.util.ListUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ClassName : CLI0309
@@ -23,18 +21,24 @@ public class CLI0309 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         List<ClinicalBloodDoc> clinicalBloodDocs = inputInfo.getClinicalBloodDocs();//输血记录
-        if(ListUtil.isEmpty(clinicalBloodDocs)){
+        List<ClinicBloodEffectDoc> clinicBloodEffectDocs = inputInfo.getClinicBloodEffectDocs();//输血效果评价
+        if (ListUtil.isEmpty(clinicalBloodDocs) || ListUtil.isEmpty(clinicBloodEffectDocs)) {
             return;
         }
-        List<ClinicBloodEffectDoc> clinicBloodEffectDocs = inputInfo.getClinicBloodEffectDocs();//输血效果评价
-        if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
-            for (ClinicBloodEffectDoc cliB:clinicBloodEffectDocs) {
+        if (clinicalBloodDocs.size() != clinicBloodEffectDocs.size()) {
+            status.set("-1");
+        }
+        /*
+        if (clinicalBloodDocs != null && clinicalBloodDocs.size() > 0) {
+            for (ClinicBloodEffectDoc cliB : clinicBloodEffectDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(StringUtils.isEmpty(cliBStructureMap.get("输注后效果评价"))){
+                if (StringUtils.isEmpty(cliBStructureMap.get("输注后效果评价"))) {
                     status.set("-1");
                     break;
                 }
             }
         }
+
+         */
     }
 }

+ 4 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxConsultationDocTrans.java

@@ -240,7 +240,11 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
             "新会诊-会诊时间=会诊时间",
             "新会诊-会诊地点=会诊地点",
             "新会诊-接待医生=受邀医生",
+            "新会诊-会诊意见=会诊意见",
             "签名++++=签名",
+            "申请理由目的=会诊目的",
+            "受邀科室=会诊科室",
+            "受邀医生=会诊医师",
             "++++会诊医师=会诊医师"
     );