表结构更新

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

@@ -1,8 +1,11 @@
 package org.jeecg.modules.medical.entity;
 
+import lombok.Data;
+
 /**
  * 医嘱明细接口入参
  */
+@Data
 public class AdviceDetailsVO {
     private String project_code;//char	项目编码，正常情况必填，特殊情况，如生化全套等没有医保编码，可放空。
     private String hospital_code;

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

@@ -1,5 +1,8 @@
 package org.jeecg.modules.medical.entity;
 
+import lombok.Data;
+
+@Data
 public class DiagnosesVO {
     private String diagnose_code;    //true	char	诊断代码（使用医保下发诊断代码（ICD-10））
     private String diagnose_desc;    //true	char	诊断描述

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

@@ -45,10 +45,6 @@ public class MedicalInsRuleInfo implements Serializable {
     @Excel(name = "规则编码", width = 15)
     @ApiModelProperty(value = "规则编码")
     private java.lang.String ruleCode;
-	/**功能*/
-	@Excel(name = "功能", width = 15)
-    @ApiModelProperty(value = "功能")
-    private java.lang.String function;
 	/**类别*/
 	@Excel(name = "类别", width = 15)
     @ApiModelProperty(value = "类别")
@@ -94,10 +90,6 @@ public class MedicalInsRuleInfo implements Serializable {
 	@Excel(name = "调用场景;事前提醒、事中预警、事后监管", width = 15)
     @ApiModelProperty(value = "调用场景;事前提醒、事中预警、事后监管")
     private java.lang.String callScenario;
-	/**是否启用*/
-	@Excel(name = "是否启用", width = 15)
-    @ApiModelProperty(value = "是否启用")
-    private java.lang.String enable;
 	/**状态*/
 	@Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")

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

@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Component
-@ConditionalOnProperty(name = "module", havingValue = Constant.MODULE_RULEENGINE_NAME)
+//@ConditionalOnProperty(name = "module", havingValue = Constant.MODULE_RULEENGINE_NAME)
 public class RuleEngine {
     private List<MedicalInsRuleInfo> medicalInsRuleInfoList = new ArrayList();
     @Autowired

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

@@ -1,9 +1,13 @@
 package org.jeecg;
 
+import cn.hutool.core.bean.BeanUtil;
 import org.jeecg.modules.demo.mock.MockController;
 import org.jeecg.modules.demo.test.entity.JeecgDemo;
 import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
 import org.jeecg.modules.demo.test.service.IJeecgDemoService;
+import org.jeecg.modules.medical.entity.AdviceDetailsVO;
+import org.jeecg.modules.medical.entity.DiagnosesVO;
+import org.jeecg.modules.medical.entity.MidIncidentWarningVO;
 import org.jeecg.modules.medical.ruleengine.SPELUtil;
 import org.jeecg.modules.system.service.ISysDataLogService;
 import org.junit.Assert;
@@ -14,7 +18,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
@@ -24,7 +30,28 @@ public class SpelTest {
 
 	@Test
 	public void testSpel(){
-
+		MidIncidentWarningVO midIncidentWarningVO = new MidIncidentWarningVO();
+		List<DiagnosesVO> diagnosesVOList = new ArrayList<>();
+		DiagnosesVO diagnosesVO = new DiagnosesVO();
+		diagnosesVO.setDiagnose_desc("1111");
+		diagnosesVO.setDiagnose_code("11113");
+		DiagnosesVO diagnosesVO1 = new DiagnosesVO();
+		diagnosesVO1.setDiagnose_desc("1112");
+		diagnosesVO1.setDiagnose_code("11123");
+		diagnosesVOList.add(diagnosesVO);
+		diagnosesVOList.add(diagnosesVO1);
+		midIncidentWarningVO.setDiagnoses(diagnosesVOList);
+		List<AdviceDetailsVO> AdviceDetailsVOList = new ArrayList<>();
+		AdviceDetailsVO detailsVO = new AdviceDetailsVO();
+		detailsVO.setProject_code("women");
+		AdviceDetailsVOList.add(detailsVO);
+		AdviceDetailsVO detailsVO1 = new AdviceDetailsVO();
+		detailsVO1.setProject_code("women111");
+		AdviceDetailsVOList.add(detailsVO1);
+		midIncidentWarningVO.setAdvice_details(AdviceDetailsVOList);
+		Map<String,Object> dataMap = BeanUtil.beanToMap(midIncidentWarningVO);
+		Object list = dataMap.get("advice_details");
+		System.out.println(list instanceof List);
 	}
 
 }