zhangzw 4 năm trước cách đây
mục cha
commit
79167bd342

+ 7 - 4
src/main/java/com/diagbot/enums/data/BehospitalWayEnum.java

@@ -3,10 +3,13 @@ package com.diagbot.enums.data;
 import lombok.Setter;
 
 public enum BehospitalWayEnum implements AKeyedNamed{
-    EMERGENCY("1", "急诊"),
-    OUTPATIENT("2", "门诊"),
-    OTHER_MEDICAL("3", "其他医疗机构转入"),
-    OTHER("9", "其他");
+    COMMON("1", "普通"),
+    TRANSFER_HOSPITAL("2", "转院"),
+    EMERGENCY_TREATMENT("3", "急诊"),
+    OBSERVATION("4", "留观"),
+    OUTPATIENT("5", "门诊"),
+    DAY_SURGERY("18", "日间手术"),
+    STIPULATE_ENTITY("12", "规定病种");
 
     @Setter
     private String key;

+ 16 - 13
src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -375,24 +375,28 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             wrapper.eq("hospital_id",medicalRecord.getHospitalId());
             wrapper.eq("hospital_model_name",medicalRecord.getRecTitle());
             ModelHospital mode=modelHospitalFacade.getOne(wrapper, false);
+            String recTitle = medicalRecord.getRecTitle();
             if(mode!=null){
                 modeId=mode.getStandModelId();
             }else{
                 modeId=Long.valueOf("0");
-                if(medicalRecord.getRecTitle().contains("查房") || medicalRecord.getRecTitle().contains("知情同意书")){
-                    ModelHospital modelHospital=new ModelHospital();
-                    modelHospital.setHospitalId(5L);
-                    modelHospital.setHospitalModelName(medicalRecord.getRecTitle());
-                    modelHospital.setStandModelId(4L);
-                    if(medicalRecord.getRecTitle().contains("查房")){
-                        modelHospital.setStandModelName("查房记录");
-                    }
-                    if(medicalRecord.getRecTitle().contains("知情同意书")){
-                        modelHospital.setStandModelName("知情同意书");
-                    }
-                    modelHospitalFacade.save(modelHospital);
+                ModelHospital modelHospital=new ModelHospital();
+                modelHospital.setHospitalId(5L);
+                modelHospital.setHospitalModelName(medicalRecord.getRecTitle());
+                if(recTitle.contains("查房")){
                     modeId=4L;
+                    modelHospital.setStandModelId(4L);
+                    modelHospital.setStandModelName("查房记录");
+                }else if(recTitle.contains("手术知情同意书")){
+                    modeId=16L;
+                    modelHospital.setStandModelId(16L);
+                    modelHospital.setStandModelName("知情同意书");
+                }else if(recTitle.contains("有创") && recTitle.contains("知情同意书")){
+                    modeId=59L;
+                    modelHospital.setHospitalId(59L);
+                    modelHospital.setHospitalModelName(recTitle);
                 }
+                modelHospitalFacade.save(modelHospital);
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("文书信息-初始化modeId",JSON.toJSONString(medicalRecord),modeId.toString(),"操作成功!");
             return modeId;
@@ -420,7 +424,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                         .eq("is_deleted",IsDeleteEnum.N)
                         .set("is_deleted",IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
-
                 Boolean flag=update(new MedicalRecord(),updateWrapper);
                 if(flag){
                     UpdateWrapper<MedicalRecordContent> updateWrapperContent=new UpdateWrapper<>();