事中住院接口

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

@@ -126,6 +126,7 @@ public class HisController extends JeecgController<Audit, IAuditService> {
 
         String ipStr = HttpUtils.getIPAddress(httpServletRequest);
         log.info("事中远端请求的服务ip地址:{}", ipStr);
+        midIncidentWarningVO.setVisit_type("2");
         MidResult midResult = ruleEngine.dealMidInterfaceEngin(midIncidentWarningVO);
         return Result.OK(midResult);
     }

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

@@ -170,13 +170,11 @@ public class HospGetDataToRuleEngine {
         Integer days = DateTimeUtil.getDayByAgeStr(patientAge);
         midIncidentWarningVO.setPatientAgeDays(days);
         midIncidentWarningVO.setTotoal_amount(totalAmount);
-//        midIncidentWarningVO.setVisit_type("1");
-        List<String> diagnoseStrList = new ArrayList<>();
+
         List<String> medicalDiagnoseStrList = new ArrayList<>();
         List<DiagnosesVO> diagnosesVOList = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(diagnoseList)) {
             for (Map<String, Object> diagnoseMap : diagnoseList) {
-                diagnoseStrList.add(diagnoseMap.get("diagnose_code").toString());
                 medicalDiagnoseStrList.add(diagnoseMap.get("medical_diagnose_code").toString());
                 DiagnosesVO diagnosesVO = new DiagnosesVO();
                 diagnosesVO.setDiagnose_code(diagnoseMap.get("diagnose_code").toString());
@@ -246,10 +244,9 @@ public class HospGetDataToRuleEngine {
                 QueryWrapper<MidIncidentAuditDetail> queryWrapper = new QueryWrapper<>();
                 queryWrapper.select("medical_ins_rule_info_code as medicalInsRuleInfoCode,medical_ins_rule_info_name as medicalInsRuleInfoName," +
                         "treatment_type as treatmentType,violation_level as violationLevel,amount,description");
-                queryWrapper.groupBy("medical_ins_rule_info_code");
                 queryWrapper.eq("mid_incident_audit_id", midIncidentAudit.getId());
+                queryWrapper.groupBy("medical_ins_rule_info_code");
                 List<MidIncidentAuditDetail> midIncidentAuditDetailList = midIncidentAuditDetailService.list(queryWrapper);
-//                List<MidIncidentAuditDetail> midIncidentAuditDetailList = midIncidentAuditDetailService.lambdaQuery().eq(MidIncidentAuditDetail::getMidIncidentAuditId, midIncidentAudit.getId()).list();
                 List<MidRule> midRuleList = new ArrayList<>();
                 for(MidIncidentAuditDetail midIncidentAuditDetail : midIncidentAuditDetailList){
                     MidRule midRule = new MidRule();

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

@@ -612,8 +612,6 @@ public class RuleEngine {
             //callScenario 1=事前  2=事后  3=事前/事后 4=事中 5=事后/事中
             List<String> callScenarioList = Arrays.asList("4", "5");
             boolean sendFlag = false;
-
-
             List<Map<String,Object>> detailMapList = new ArrayList<>();
             for(AdviceDetailsVO adviceDetailsVO : midIncidentWarningVO.getAdvice_details()){
                 detailMapList.add(BeanUtil.beanToMap(adviceDetailsVO));
@@ -671,10 +669,9 @@ public class RuleEngine {
                 QueryWrapper<MidIncidentAuditDetail> queryWrapper = new QueryWrapper<>();
                 queryWrapper.select("medical_ins_rule_info_code as medicalInsRuleInfoCode,medical_ins_rule_info_name as medicalInsRuleInfoName," +
                         "treatment_type as treatmentType,violation_level as violationLevel,amount,description");
-                queryWrapper.groupBy("medical_ins_rule_info_code");
                 queryWrapper.eq("mid_incident_audit_id", midIncidentAudit.getId());
+                queryWrapper.groupBy("medical_ins_rule_info_code");
                 List<MidIncidentAuditDetail> midIncidentAuditDetailList = midIncidentAuditDetailService.list(queryWrapper);
-//                List<MidIncidentAuditDetail> midIncidentAuditDetailList = midIncidentAuditDetailService.lambdaQuery().eq(MidIncidentAuditDetail::getMidIncidentAuditId, midIncidentAudit.getId()).list();
                 List<MidRule> midRuleList = new ArrayList<>();
                 for(MidIncidentAuditDetail midIncidentAuditDetail : midIncidentAuditDetailList){
                     MidRule midRule = new MidRule();
@@ -1065,6 +1062,10 @@ public class RuleEngine {
             if (StringUtils.isNotBlank(midIncidentWarningVO.getVisit_time())) {
                 Date visitTime = DateUtils.parseDate(midIncidentWarningVO.getVisit_time(), "yyyy-MM-dd HH:mm:ss");
                 midIncidentAudit.setVisitTime(visitTime);
+                //门诊，事中就诊时间为当前时间
+            }else if("2".equals(midIncidentWarningVO.getVisit_type())){
+                Date visitTime = new Date();
+                midIncidentAudit.setVisitTime(visitTime);
             }
         } catch (ParseException e) {
             log.error(e.getMessage(), e);