瀏覽代碼

接口日志表

0027005599 2 年之前
父節點
當前提交
364eba35c6

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

@@ -2,6 +2,8 @@ package org.jeecg.modules.medical.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -97,7 +99,9 @@ public class HisController extends JeecgController<Audit, IAuditService> {
     @ApiOperation(value="事中提醒接口", notes="事中提醒接口调用")
     @PostMapping(value = "/midIncidentWarning")
     public Result<String> midIncidentWarning(@RequestBody MidIncidentWarningVO midIncidentWarningVO) {
-        Map<String,Object> paramMap = BeanUtil.beanToMap(midIncidentWarningVO);
+        String jsonStr = JSON.toJSONString(midIncidentWarningVO);
+        log.info("事中提醒接收报文:{}", jsonStr);
+        JSONObject paramMap = JSON.parseObject(jsonStr);
         ruleEngine.dealMidInterfaceEngin("midIncidentWarning", paramMap, midIncidentWarningVO);
         return Result.OK("添加成功!");
     }

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/AdviceDetailsVO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class AdviceDetailsVO {
     private String project_code;//char	项目编码,正常情况必填,特殊情况,如生化全套等没有医保编码,可放空。
-    private String hospital_code;
+//    private String hospital_code;//院内项目编码
     private String project_name;//	true	char	项目名称
     private String project_type;//项目类型 药品、耗材、诊疗
     private String medical_project_code;//医保项目编码

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

@@ -37,30 +37,12 @@ public class MidIncidentAudit implements Serializable {
 	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
-//	/**医保规则ID*/
-//	@Excel(name = "医保规则ID", width = 15)
-//    @ApiModelProperty(value = "医保规则ID")
-//    private java.lang.Integer medicalInsRuleInfoId;
-//	/**医保规则编码*/
-//	@Excel(name = "医保规则编码", width = 15)
-//    @ApiModelProperty(value = "医保规则编码")
-//    private java.lang.String medicalInsRuleInfoCode;
-//	/**医保规则名称*/
-//	@Excel(name = "医保规则名称", width = 15)
-//    @ApiModelProperty(value = "医保规则名称")
-//    private java.lang.String medicalInsRuleInfoName;
+
 	/**就诊类别;住院/门诊*/
 	@Excel(name = "就诊类别;住院/门诊", width = 15)
     @ApiModelProperty(value = "就诊类别;住院/门诊")
     private java.lang.String treatmentType;
-//	/**警示级别*/
-//	@Excel(name = "警示级别", width = 15)
-//    @ApiModelProperty(value = "警示级别")
-//    private java.lang.String reminderLevel;
-//    /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3:仅提醒展示*/
-//    @Excel(name = "违规等级", width = 15)
-//    @ApiModelProperty(value = "违规等级")
-//    private java.lang.Integer violationLevel;
+
 	/**提醒类别;事前提醒,事中预警,事后监管*/
 	@Excel(name = "提醒类别;事前提醒,事中预警,事后监管", width = 15)
     @ApiModelProperty(value = "提醒类别;事前提醒,事中预警,事后监管")

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

@@ -206,6 +206,9 @@ public class RuleEngine {
         midIncidentAudit.setPrescriptionNumber(midIncidentWarningVO.getDoctor_advice_no());
         midIncidentAudit.setNoticeType("事中预警");
         midIncidentAuditService.save(midIncidentAudit);
+
+
+
         return midIncidentAudit;
     }
 

+ 10 - 1
jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/SpelTest.java

@@ -1,6 +1,8 @@
 package org.jeecg;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import org.jeecg.modules.demo.mock.MockController;
 import org.jeecg.modules.demo.test.entity.JeecgDemo;
 import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
@@ -49,9 +51,16 @@ public class SpelTest {
 		detailsVO1.setProject_code("women111");
 		AdviceDetailsVOList.add(detailsVO1);
 		midIncidentWarningVO.setAdvice_details(AdviceDetailsVOList);
-		Map<String,Object> dataMap = BeanUtil.beanToMap(midIncidentWarningVO);
+		String jsonStr = JSON.toJSONString(midIncidentWarningVO);
+		System.out.println(jsonStr);
+		JSONObject dataMap = JSON.parseObject(jsonStr);
+
 		Object list = dataMap.get("advice_details");
 		System.out.println(list instanceof List);
+		List<Map<String,Object>> adviceDetailsList = (List<Map<String, Object>>) list;
+		for(Map<String,Object> adMap : adviceDetailsList){
+			System.out.println(adMap.get("project_code"));
+		}
 	}
 
 }