规则库 诊断编码 查看

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

@@ -79,9 +79,10 @@ public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDia
 													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													   HttpServletRequest req) {
-		 QueryWrapper<DiagnoseItems> queryWrapper = QueryGenerator.initQueryWrapper(diagnoseItems, req.getParameterMap());
 		 Page<DiagnoseItems> page = new Page<DiagnoseItems>(pageNo, pageSize);
-		 IPage<DiagnoseItems> pageList = diagnoseItemsService.page(page, queryWrapper);
+
+		 IPage<DiagnoseItems> pageList = diagnoseItemsService.diagnosePage(page, diagnoseItems);
+
 		 return Result.OK(pageList);
 	 }
 	

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

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -33,7 +31,7 @@ public class DiagnoseItems implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键ID*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private Integer id;
 	/**医院诊断编码*/
@@ -72,4 +70,15 @@ public class DiagnoseItems implements Serializable {
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+
+    @TableField(exist = false)
+    private Integer projectCodeType;
+
+    @TableField(exist = false)
+    private Integer projectCode;
+
+    @TableField(exist = false)
+    private Integer medicalInsRuleInfoId;
+
 }

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

@@ -2,6 +2,8 @@ package org.jeecg.modules.medical.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.medical.entity.DiagnoseItems;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -13,5 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  */
 public interface DiagnoseItemsMapper extends BaseMapper<DiagnoseItems> {
-
+    public IPage<DiagnoseItems> diagnosePage(Page<DiagnoseItems> page, @Param("ew")DiagnoseItems diagnoseItems);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/DiagnoseItemsMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.medical.mapper.DiagnoseItemsMapper">
 
+    <select id="diagnosePage" resultType="org.jeecg.modules.medical.entity.DiagnoseItems">
+
+
+        select pd.medical_diagnose_code, d.medical_diagnose_name, d.diagnose_code, d.diagnose_name
+        From medical_ins_rule_project_diagnose pd
+                 left join diagnose_items d on pd.medical_diagnose_code = d.medical_diagnose_code
+        where pd.medical_ins_rule_info_id = #{ew.medicalInsRuleInfoId}
+          and pd.medical_ins_project_code = #{ew.projectCode}
+          and pd.project_code_type = #{ew.projectCodeType}
+
+    </select>
 </mapper>

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.medical.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.medical.entity.DiagnoseItems;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IDiagnoseItemsService extends IService<DiagnoseItems> {
 
+     IPage<DiagnoseItems> diagnosePage(Page<DiagnoseItems> page, DiagnoseItems mgVmDevice);
+
+
 }

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.medical.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.medical.entity.DiagnoseItems;
 import org.jeecg.modules.medical.mapper.DiagnoseItemsMapper;
 import org.jeecg.modules.medical.service.IDiagnoseItemsService;
@@ -16,4 +18,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class DiagnoseItemsServiceImpl extends ServiceImpl<DiagnoseItemsMapper, DiagnoseItems> implements IDiagnoseItemsService {
 
+    @Override
+    public IPage<DiagnoseItems> diagnosePage(Page<DiagnoseItems> page, DiagnoseItems diagnoseItems) {
+
+        return baseMapper.diagnosePage(page,diagnoseItems);
+    }
 }

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

@@ -3,6 +3,8 @@ package org.jeecg;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.WebsocketConst;
 import org.jeecg.modules.demo.mock.MockController;
 import org.jeecg.modules.demo.test.entity.JeecgDemo;
 import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
@@ -11,6 +13,7 @@ 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.message.websocket.WebSocket;
 import org.jeecg.modules.system.service.ISysDataLogService;
 import org.junit.Assert;
 import org.junit.Test;
@@ -25,42 +28,57 @@ import java.util.List;
 import java.util.Map;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = JeecgSystemApplication.class)
 public class SpelTest {
-	@Autowired
-	SPELUtil spelUtil;
+    @Autowired
+    SPELUtil spelUtil;
+    @Autowired
+    private WebSocket webSocket;
 
-	@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);
-		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"));
-		}
-	}
+    public static void main(String[] args) {
+        System.out.println("sdf");
+    }
+    @Test
+    public void socket() {
+
+        JSONObject obj = new JSONObject();
+        obj.put("type", "before");
+        obj.put("id", 12);
+        webSocket.sendMessage("172.20.10.4",obj.toJSONString());
+    }
+
+    @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);
+        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"));
+        }
+    }
 
 }