Merge remote-tracking branch 'origin/debug' into debug

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/FirstCourseRecordAI.java

@@ -113,6 +113,9 @@ public class FirstCourseRecordAI extends ModelAI {
     public void putCaseCharacteristicCrfData(JSONObject jsonObject, InputInfo inputInfo) {
         JSONObject aiOut = loadEntity(jsonObject, entityRelationObject, outputs, content);
         //使用现病史结构来处理病历特点
+        if (aiOut == null) {
+            return;
+        }
         EntityProcessClinic entityProcessClinic = new EntityProcessClinic();
         PresentLabel presentLabel = entityProcessClinic.extractEntity(aiOut);
         //临床表现
@@ -138,6 +141,9 @@ public class FirstCourseRecordAI extends ModelAI {
      */
     public void putInitialDiagCrfData(JSONObject jsonObject, InputInfo inputInfo) {
         JSONObject aiOut = loadEntity(jsonObject, entityRelationObject, outputs, content);
+        if (aiOut == null) {
+            return;
+        }
         //诊断信息
         EntityProcessDiag entityProcessDiag = new EntityProcessDiag();
         List<Diag> diags = entityProcessDiag.extractEntity(aiOut);
@@ -152,6 +158,9 @@ public class FirstCourseRecordAI extends ModelAI {
      */
     public void putDiagnosisCrfData(JSONObject jsonObject, InputInfo inputInfo) {
         JSONObject aiOut = loadEntity(jsonObject, entityRelationObject, outputs, content);
+        if (aiOut == null) {
+            return;
+        }
         //使用现病史结构来处理诊断依据
         EntityProcessClinic entityProcessClinic = new EntityProcessClinic();
         PresentLabel presentLabel = entityProcessClinic.extractEntity(aiOut);
@@ -167,6 +176,9 @@ public class FirstCourseRecordAI extends ModelAI {
      */
     public void putDifferentialDiagCrfData(JSONObject jsonObject, InputInfo inputInfo) {
         JSONObject aiOut = loadEntity(jsonObject, entityRelationObject, outputs, content);
+        if (aiOut == null) {
+            return;
+        }
         //诊断信息
         EntityProcessDiag entityProcessDiag = new EntityProcessDiag();
         List<Diag> diags = entityProcessDiag.extractEntity(aiOut);
@@ -181,6 +193,9 @@ public class FirstCourseRecordAI extends ModelAI {
      */
     public void putTreatPlanCrfData(JSONObject jsonObject, InputInfo inputInfo) {
         JSONObject aiOut = loadEntity(jsonObject, entityRelationObject, outputs, content);
+        if (aiOut == null) {
+            return;
+        }
         //诊疗计划
         EntityProcessTreatPlan entityProcessTreatPlan = new EntityProcessTreatPlan();
         TreatPlanLabel treatPlanLabel = entityProcessTreatPlan.extractEntity(aiOut);

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/LeaveHospitalAI.java

@@ -69,6 +69,9 @@ public class LeaveHospitalAI extends ModelAI {
      */
     public void putDischargeCrfData(JSONObject jsonObject, InputInfo inputInfo) {
         JSONObject aiOut = loadEntity(jsonObject, entityRelationObject, outputs, content);
+        if (aiOut == null) {
+            return;
+        }
         //使用现病史结构来处理病历特点
         EntityProcessLeaveHospital entityProcessLeaveHospital = new EntityProcessLeaveHospital();
         LeaveHospitalLabel leaveHospitalLabel = entityProcessLeaveHospital.extractEntity(aiOut);

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/OperationAI.java

@@ -59,6 +59,9 @@ public class OperationAI extends ModelAI {
      */
     public void putOperationDiscussionCrfData(JSONObject jsonObject, InputInfo inputInfo) {
         JSONObject aiOut = loadEntity(jsonObject, entityRelationObject, outputs, content);
+        if (aiOut == null) {
+            return;
+        }
         String originalText = jsonObject.getString("originalText");
         //使用现病史结构来处理病历特点
         EntityProcessOperationDiscussion entityProcessOperationDiscussion = new EntityProcessOperationDiscussion();

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/ThreeLevelWardAI.java

@@ -138,6 +138,9 @@ public class ThreeLevelWardAI extends ModelAI {
      */
     public void putWardRoundCrfData(JSONObject jsonObject, InputInfo inputInfo, int serious) {
         JSONObject aiOut = loadEntity(jsonObject, entityRelationObject, outputs, content);
+        if (aiOut == null) {
+            return;
+        }
         String wardDate = jsonObject.getString("wardDate");
         String detailTitle = jsonObject.getString("detail_title");
         //使用现病史结构来处理病历特点

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouDeathCaseDiscussDocTrans.java

@@ -45,7 +45,7 @@ public class TaiZhouDeathCaseDiscussDocTrans extends ModelDocTrans {
             "年龄=",
             "讨论小结=",
             "主诉=",
-            "主持人=",
+            "主持人=讨论主持人",
             "当前诊断=",
             "床号=",
             "实验室检查=",
@@ -53,15 +53,15 @@ public class TaiZhouDeathCaseDiscussDocTrans extends ModelDocTrans {
             "死亡原因=",
             "审核日期=",
             "记录人=",
-            "死亡日期=",
+            "死亡日期=死亡时间",
             "性别=",
             "辅助检查结果=",
-            "讨论意见=",
+            "讨论意见=讨论内容",
             "本人姓名=",
             "病历号=",
             "病历日期=",
             "职称=",
-            "现病史-发病情况=",
+            "现病史-发病情况=入院情况",
             "脉搏=",
             "呼吸=",
             "入院日期=",