医师级别添加

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/SystemEventAttrConstant.java

@@ -230,5 +230,9 @@ public class SystemEventAttrConstant {
      * 门诊号，住院号
      */
     public static final String HIS_VISIT_NO = "visit_no";
+    /**
+     * his的医生级别
+     */
+    public static final String HIS_DOCTOR_LEVEL = "doctor_level";
 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MasterAdmissionBill.java

@@ -343,4 +343,7 @@ public class MasterAdmissionBill implements Serializable {
     private String invalidDate;
 
     private String backReceiptNo;
+
+    @TableField(exist = false)
+    private String doctorLevel;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentAudit.java

@@ -66,8 +66,6 @@ public class MidIncidentAudit implements Serializable {
 	@Excel(name = "主诊医师编码", width = 15)
     @ApiModelProperty(value = "主诊医师编码")
     private java.lang.String doctorId;
-
-    private String doctorLevel;
 	/**个人编号*/
 	@Excel(name = "个人编号", width = 15)
     @ApiModelProperty(value = "个人编号")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/job/AfterWaringLogJob.java

@@ -72,16 +72,18 @@ public class AfterWaringLogJob implements Job {
         if(StringUtils.isNotBlank(masterAdmissionBill.getBackReceiptNo())){
             backDetailToHis.updateAfterwardsBillBack(masterAdmissionBill.getBackReceiptNo(), masterAdmissionBill.getHisid());
         }
+        List<SysUser> sysUserList = sysUserService.lambdaQuery().eq(SysUser::getDoctorId, masterAdmissionBill.getDoctorId()).list();
+        String doctorLevel = "0";
+        if (CollectionUtil.isNotEmpty(sysUserList)) {
+            doctorLevel = sysUserList.get(0).getDoctorLevel();
+        }
+        masterAdmissionBill.setDoctorLevel(doctorLevel);
         AfterIncidentLog afterIncidentLog = afterIncidentLogService.addAfterIncidentLog(masterAdmissionBill);
         List<HospitalizatioSettleDetail> hospitalizatioSettleDetails = hospitalizatioSettleDetailService.lambdaQuery().eq(HospitalizatioSettleDetail::getHisid, masterAdmissionBill.getHisid()).list();
         sumDetail(hospitalizatioSettleDetails);
         List<AfterIncidentDetailLog> afterIncidentDetailLogList = new ArrayList<>();
         AfterIncidentDetailLog afterIncidentDetailLog = null;
-        List<SysUser> sysUserList = sysUserService.lambdaQuery().eq(SysUser::getDoctorId, afterIncidentLog.getDoctorId()).list();
-        String doctorLevel = "0";
-        if (CollectionUtil.isNotEmpty(sysUserList)) {
-            doctorLevel = sysUserList.get(0).getDoctorLevel();
-        }
+
         for (HospitalizatioSettleDetail hospitalizatioSettleDetail : hospitalizatioSettleDetails) {
             afterIncidentDetailLog = new AfterIncidentDetailLog();
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/FactorEnchangeFactory.java

@@ -314,6 +314,7 @@ public class FactorEnchangeFactory {
             afterwardsAuditDetail.setErrorDescription(spelLog.toString());
         }
         afterwardsAuditDetail.setHisid(afterwardsAudit.getHisid());
+        afterwardsAuditDetail.setDoctorLevel(itemMap.get(SystemEventAttrConstant.HIS_DOCTOR_LEVEL).toString());
         return afterwardsAuditDetail;
     }
 
@@ -417,6 +418,7 @@ public class FactorEnchangeFactory {
             midIncidentAuditDetail.setErrorDescription(spelLog.toString());
         }
 
+        midIncidentAuditDetail.setDoctorLevel(itemMap.get(SystemEventAttrConstant.HIS_DOCTOR_LEVEL).toString());
         return midIncidentAuditDetail;
     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/RuleEngine.java

@@ -1171,7 +1171,7 @@ public class RuleEngine {
         afterwardsAudit.setPatientGender(afterIncidentLog.getPatientGender());
         afterwardsAudit.setPatientBirthday(afterIncidentLog.getPatientBirthday());
         afterwardsAudit.setHisid(afterIncidentLog.getHisid());
-        afterwardsAudit.setDoctorLevel(afterIncidentLog.)
+        afterwardsAudit.setDoctorLevel(afterIncidentLog.getDoctorLevel());
 //        afterwardsAudit.setBedNumber(afterIncidentLog.);
         afterwardsAuditService.save(afterwardsAudit);
         if (StringUtils.isNotBlank(afterIncidentLog.getDiagnoses())) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterIncidentLogServiceImpl.java

@@ -53,6 +53,7 @@ public class AfterIncidentLogServiceImpl extends ServiceImpl<AfterIncidentLogMap
             medicalINsurance = 1;
         }
         afterIncidentLog.setMedicalInsurance(medicalINsurance);
+        afterIncidentLog.setDoctorLevel(masterAdmissionBill.getDoctorLevel());
         this.save(afterIncidentLog);
         return afterIncidentLog;
     }