写诊断信息到事中事后

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

@@ -33,7 +33,7 @@ public class AfterwardsIncidentAuditDiagnose implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
 	/**事后监管工单ID*/

jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/MidAuditDataTest.java

@@ -8,6 +8,7 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.entity.AfterwardsAudit;
 import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
+import org.jeecg.modules.medical.entity.AfterwardsIncidentAuditDiagnose;
 import org.jeecg.modules.medical.entity.MedicalInsRuleInfo;
 import org.jeecg.modules.medical.entity.MedicalInsRuleProject;
 import org.jeecg.modules.medical.entity.MidIncidentAudit;
@@ -133,6 +134,8 @@ public class MidAuditDataTest {
     @Test
     public void genMidDiag(){
         List<MidIncidentAudit> midIncidentAuditList = midIncidentAuditService.lambdaQuery().eq(MidIncidentAudit::getPatientId, "2222941236").list();
+        log.info("进入查询，数据条数:{}", midIncidentAuditList.size());
+
         List<MidIncidentAuditDiagnose> midIncidentAuditDiagnoseList = new ArrayList<>();
         MidIncidentAuditDiagnose midIncidentAuditDiagnose = null;
         for(MidIncidentAudit midIncidentAudit : midIncidentAuditList){
@@ -147,14 +150,44 @@ public class MidAuditDataTest {
             midIncidentAuditDiagnose.setOutpatientNumber(midIncidentAudit.getOutpatientNumber());
             midIncidentAuditDiagnose.setCreateTime(new Date());
             midIncidentAuditDiagnoseList.add(midIncidentAuditDiagnose);
+            log.info("midIncidentAuditDiagnose:{}", midIncidentAuditDiagnose);
         }
         midIncidentAuditDiagnoseService.saveBatch(midIncidentAuditDiagnoseList, 1000);
     }
 
+
     @Test
+    public void genAfterDiag(){
+        List<AfterwardsAudit> midIncidentAuditList = afterwardsAuditService.lambdaQuery().list();
+        log.info("进入查询，数据条数:{}", midIncidentAuditList.size());
+
+        List<AfterwardsIncidentAuditDiagnose> midIncidentAuditDiagnoseList = new ArrayList<>();
+        AfterwardsIncidentAuditDiagnose midIncidentAuditDiagnose = null;
+        for(AfterwardsAudit afterwardsAudit : midIncidentAuditList){
+            midIncidentAuditDiagnose = new AfterwardsIncidentAuditDiagnose();
+            List<SttlMasterBill> sttlMasterBills = sttlMasterBillService.lambdaQuery().eq(SttlMasterBill::getJsdjh, afterwardsAudit.getPrescriptionNumber()).list();
+            if(CollectionUtil.isEmpty(sttlMasterBills)){
+                continue;
+            }
+            SttlMasterBill sttlMasterBill = sttlMasterBills.get(0);
+            midIncidentAuditDiagnose.setAfterwardsAuditId(afterwardsAudit.getId());
+            midIncidentAuditDiagnose.setDiagnoseCode(sttlMasterBill.getCyzdbm());
+            midIncidentAuditDiagnose.setDiagnoseDesc(sttlMasterBill.getCyzdmc());
+            midIncidentAuditDiagnose.setMedDiagnoseCode(sttlMasterBill.getRyzdbm());
+            midIncidentAuditDiagnose.setMedDiagnoseDesc(sttlMasterBill.getRyksmc());
+            midIncidentAuditDiagnose.setPrescriptionNumber(afterwardsAudit.getPrescriptionNumber());
+            midIncidentAuditDiagnose.setOutpatientNumber(afterwardsAudit.getOutpatientNumber());
+            midIncidentAuditDiagnose.setCreateTime(new Date());
+            midIncidentAuditDiagnoseList.add(midIncidentAuditDiagnose);
+            log.info("afterDiag:{}", midIncidentAuditDiagnose);
+        }
+        afterwardsIncidentAuditDiagnoseService.saveBatch(midIncidentAuditDiagnoseList, 1000);
+    }
+
+//    @Test
     public void getAfterToMid(){
         log.info("进入查询");
-        List<AfterwardsAudit> afterwardsAuditList = afterwardsAuditService.lambdaQuery().eq(AfterwardsAudit::getPatientId,"2222941236").list();
+        List<AfterwardsAudit> afterwardsAuditList = afterwardsAuditService.lambdaQuery().list();
         log.info("数据条数：{}", afterwardsAuditList.size());
         MidIncidentAudit midIncidentAudit = new MidIncidentAudit();
         List<MidIncidentAudit> midIncidentAuditList = new ArrayList<>();
@@ -184,7 +217,7 @@ public class MidAuditDataTest {
             midIncidentAudit.setPatientName(audit.getPatientName());
             midIncidentAudit.setPatientId(audit.getPatientId());
             midIncidentAudit.setInHospDate(DateUtils.str2Date(sttlMasterBill.getRyrq(), new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")));
-            midIncidentAudit.setNoticeType("middle");
+            midIncidentAudit.setNoticeType("after");
             midIncidentAudit.setTreatmentType("1");
             midIncidentAudit.setVisitTime(midIncidentAudit.getInHospDate());
             midIncidentAudit.setMedicalDeptName(audit.getMedicalDeptName());