jiangjiazhi / center

Commit 4a896c19c746cadb06dc3a5c24f585a0abe1a7b9

Authored by xujiahong almost 9 years ago

Exists in master

Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/center.git

Showing 15 changed files

design-doc/design/db/院内设计.PDM
parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.xml
parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseMapsMapper.java
parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseMapsMapper.xml
parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskMapsMapper.java
parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskMapsMapper.xml
parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java
parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseMaps.java
parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskMaps.java
parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseMapsService.java
parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskMapsService.java
parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseMapsServiceImpl.java
parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskMapsServiceImpl.java
parent/hospital.web/src/test/java/test/hospital/diagnose/DiagnoseMapsTest.java
parent/hospital.web/src/test/java/test/hospital/highrisk/HighriskMapsTest.java

1	1	<?xml version="1.0" encoding="UTF-8"?>
2		-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1490855812" Name="院内设计" Objects="389" Symbols="59" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.1.0.2850"?>
	2	+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1490868251" Name="院内设计" Objects="386" Symbols="58" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.1.0.2850"?>
3	3	<!-- do not edit this file -->
4	4
5	5	<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
...	...	@@ -2446,9 +2446,9 @@
2446	2446	<c:Symbols>
2447	2447	<o:ReferenceSymbol Id="o8">
2448	2448	<a:CreationDate>1490176191</a:CreationDate>
2449		-<a:ModificationDate>1490849587</a:ModificationDate>
2450		-<a:Rect>((-56355,-11539), (-53687,2607))</a:Rect>
2451		-<a:ListOfPoints>((-56355,2607),(-56355,-3880),(-53687,-3880),(-53687,-11539))</a:ListOfPoints>
	2449	+<a:ModificationDate>1490868251</a:ModificationDate>
	2450	+<a:Rect>((-56355,-11787), (-52862,2607))</a:Rect>
	2451	+<a:ListOfPoints>((-56355,2607),(-56355,-3880),(-52862,-3880),(-52862,-11787))</a:ListOfPoints>
2452	2452	<a:CornerStyle>1</a:CornerStyle>
2453	2453	<a:ArrowStyle>1</a:ArrowStyle>
2454	2454	<a:LineColor>12615680</a:LineColor>
...	...	@@ -2468,9 +2468,9 @@
2468	2468	</o:ReferenceSymbol>
2469	2469	<o:ReferenceSymbol Id="o12">
2470	2470	<a:CreationDate>1490176191</a:CreationDate>
2471		-<a:ModificationDate>1490849372</a:ModificationDate>
2472		-<a:Rect>((-46061,-16676), (-7131,-12633))</a:Rect>
2473		-<a:ListOfPoints>((-7131,-16676),(-20025,-16676),(-20025,-12633),(-46061,-12633))</a:ListOfPoints>
	2471	+<a:ModificationDate>1490868251</a:ModificationDate>
	2472	+<a:Rect>((-45236,-16676), (-7131,-12881))</a:Rect>
	2473	+<a:ListOfPoints>((-7131,-16676),(-20025,-16676),(-20025,-12881),(-45236,-12881))</a:ListOfPoints>
2474	2474	<a:CornerStyle>1</a:CornerStyle>
2475	2475	<a:ArrowStyle>1</a:ArrowStyle>
2476	2476	<a:LineColor>12615680</a:LineColor>
...	...	@@ -2512,9 +2512,9 @@
2512	2512	</o:ReferenceSymbol>
2513	2513	<o:ReferenceSymbol Id="o18">
2514	2514	<a:CreationDate>1490176191</a:CreationDate>
2515		-<a:ModificationDate>1490849638</a:ModificationDate>
2516		-<a:Rect>((-47154,-12023), (-27558,1914))</a:Rect>
2517		-<a:ListOfPoints>((-27558,1914),(-27558,-12023),(-47154,-12023))</a:ListOfPoints>
	2515	+<a:ModificationDate>1490868251</a:ModificationDate>
	2516	+<a:Rect>((-46329,-12271), (-27558,1914))</a:Rect>
	2517	+<a:ListOfPoints>((-27558,1914),(-27558,-12271),(-46329,-12271))</a:ListOfPoints>
2518	2518	<a:CornerStyle>1</a:CornerStyle>
2519	2519	<a:ArrowStyle>1</a:ArrowStyle>
2520	2520	<a:LineColor>12615680</a:LineColor>
...	...	@@ -2556,9 +2556,9 @@
2556	2556	</o:ReferenceSymbol>
2557	2557	<o:ReferenceSymbol Id="o24">
2558	2558	<a:CreationDate>1490176191</a:CreationDate>
2559		-<a:ModificationDate>1490849535</a:ModificationDate>
2560		-<a:Rect>((-71819,-41579), (-64695,-14029))</a:Rect>
2561		-<a:ListOfPoints>((-71819,-41579),(-64695,-41579),(-64695,-14029))</a:ListOfPoints>
	2559	+<a:ModificationDate>1490868251</a:ModificationDate>
	2560	+<a:Rect>((-71819,-41579), (-63870,-14525))</a:Rect>
	2561	+<a:ListOfPoints>((-71819,-41579),(-63870,-41579),(-63870,-14525))</a:ListOfPoints>
2562	2562	<a:CornerStyle>1</a:CornerStyle>
2563	2563	<a:ArrowStyle>1</a:ArrowStyle>
2564	2564	<a:LineColor>12615680</a:LineColor>
...	...	@@ -2842,9 +2842,9 @@
2842	2842	</o:ReferenceSymbol>
2843	2843	<o:ReferenceSymbol Id="o63">
2844	2844	<a:CreationDate>1490599836</a:CreationDate>
2845		-<a:ModificationDate>1490849514</a:ModificationDate>
2846		-<a:Rect>((-86523,-36715), (-67834,-11906))</a:Rect>
2847		-<a:ListOfPoints>((-86523,-36715),(-67834,-36715),(-67834,-11906))</a:ListOfPoints>
	2845	+<a:ModificationDate>1490868251</a:ModificationDate>
	2846	+<a:Rect>((-86523,-36715), (-67009,-12154))</a:Rect>
	2847	+<a:ListOfPoints>((-86523,-36715),(-67009,-36715),(-67009,-12154))</a:ListOfPoints>
2848	2848	<a:CornerStyle>1</a:CornerStyle>
2849	2849	<a:ArrowStyle>1</a:ArrowStyle>
2850	2850	<a:LineColor>12615680</a:LineColor>
...	...	@@ -2864,9 +2864,9 @@
2864	2864	</o:ReferenceSymbol>
2865	2865	<o:ReferenceSymbol Id="o66">
2866	2866	<a:CreationDate>1490606869</a:CreationDate>
2867		-<a:ModificationDate>1490849354</a:ModificationDate>
2868		-<a:Rect>((-49251,-30340), (-29935,-11040))</a:Rect>
2869		-<a:ListOfPoints>((-29935,-30340),(-49251,-30340),(-49251,-11040))</a:ListOfPoints>
	2867	+<a:ModificationDate>1490868251</a:ModificationDate>
	2868	+<a:Rect>((-48426,-30340), (-29935,-11288))</a:Rect>
	2869	+<a:ListOfPoints>((-29935,-30340),(-48426,-30340),(-48426,-11288))</a:ListOfPoints>
2870	2870	<a:CornerStyle>1</a:CornerStyle>
2871	2871	<a:ArrowStyle>1</a:ArrowStyle>
2872	2872	<a:LineColor>12615680</a:LineColor>
...	...	@@ -2886,9 +2886,9 @@
2886	2886	</o:ReferenceSymbol>
2887	2887	<o:ReferenceSymbol Id="o69">
2888	2888	<a:CreationDate>1490607956</a:CreationDate>
2889		-<a:ModificationDate>1490849515</a:ModificationDate>
2890		-<a:Rect>((-99715,-13819), (-66068,-11674))</a:Rect>
2891		-<a:ListOfPoints>((-99715,-13819),(-80273,-13819),(-80273,-11674),(-66068,-11674))</a:ListOfPoints>
	2889	+<a:ModificationDate>1490868251</a:ModificationDate>
	2890	+<a:Rect>((-100705,-14397), (-65243,-11922))</a:Rect>
	2891	+<a:ListOfPoints>((-100705,-14397),(-80273,-14397),(-80273,-11922),(-65243,-11922))</a:ListOfPoints>
2892	2892	<a:CornerStyle>1</a:CornerStyle>
2893	2893	<a:ArrowStyle>1</a:ArrowStyle>
2894	2894	<a:LineColor>12615680</a:LineColor>
...	...	@@ -2908,9 +2908,9 @@
2908	2908	</o:ReferenceSymbol>
2909	2909	<o:ReferenceSymbol Id="o72">
2910	2910	<a:CreationDate>1490783106</a:CreationDate>
2911		-<a:ModificationDate>1490849737</a:ModificationDate>
2912		-<a:Rect>((-79692,-13185), (-66807,1043))</a:Rect>
2913		-<a:ListOfPoints>((-66807,-13185),(-66807,1043),(-79692,1043))</a:ListOfPoints>
	2911	+<a:ModificationDate>1490868251</a:ModificationDate>
	2912	+<a:Rect>((-79692,-13433), (-65982,1043))</a:Rect>
	2913	+<a:ListOfPoints>((-65982,-13433),(-65982,1043),(-79692,1043))</a:ListOfPoints>
2914	2914	<a:CornerStyle>1</a:CornerStyle>
2915	2915	<a:ArrowStyle>1</a:ArrowStyle>
2916	2916	<a:LineColor>12615680</a:LineColor>
2917	2917
...	...	@@ -3043,9 +3043,9 @@
3043	3043	</o:TableSymbol>
3044	3044	<o:TableSymbol Id="o10">
3045	3045	<a:CreationDate>1490176191</a:CreationDate>
3046		-<a:ModificationDate>1490849340</a:ModificationDate>
	3046	+<a:ModificationDate>1490868251</a:ModificationDate>
3047	3047	<a:IconMode>-1</a:IconMode>
3048		-<a:Rect>((-68679,-14579), (-39907,-9367))</a:Rect>
	3048	+<a:Rect>((-67854,-14827), (-39082,-9615))</a:Rect>
3049	3049	<a:AutoAdjustToText>0</a:AutoAdjustToText>
3050	3050	<a:LineColor>12615680</a:LineColor>
3051	3051	<a:FillColor>16570034</a:FillColor>
3052	3052
...	...	@@ -3559,9 +3559,9 @@
3559	3559	</o:TableSymbol>
3560	3560	<o:TableSymbol Id="o70">
3561	3561	<a:CreationDate>1490601328</a:CreationDate>
3562		-<a:ModificationDate>1490849515</a:ModificationDate>
	3562	+<a:ModificationDate>1490868250</a:ModificationDate>
3563	3563	<a:IconMode>-1</a:IconMode>
3564		-<a:Rect>((-114216,-22619), (-91868,-4545))</a:Rect>
	3564	+<a:Rect>((-115206,-23197), (-92858,-5123))</a:Rect>
3565	3565	<a:LineColor>12615680</a:LineColor>
3566	3566	<a:FillColor>16570034</a:FillColor>
3567	3567	<a:ShadowColor>12632256</a:ShadowColor>

...	...	@@ -8,17 +8,15 @@
8	8	<result column="SOURCE_ID" property="sourceId" />
9	9	<result column="VERSION_ID" property="versionId" />
10	10	<result column="NAME" property="name" />
11		- <result column="COLORCODE" property="colorcode" />
12		- <result column="COLORTEXT" property="colortext" />
	11	+ <result column="GROUPNAME" property="groupname" />
13	12	<result column="GROUPORDER" property="grouporder" />
14	13	<result column="ITEMORDER" property="itemorder" />
15		- <result column="GRADE" property="grade" />
16	14	<result column="ENABLE" property="enable" />
17	15	</resultMap>
18	16
19	17	<!-- 通用查询结果列 -->
20	18	<sql id="Base_Column_List">
21		- ID AS id, SOURCE_ID AS sourceId, VERSION_ID AS versionId, NAME AS name, COLORCODE AS colorcode, COLORTEXT AS colortext, GROUPORDER AS grouporder, ITEMORDER AS itemorder, GRADE AS grade, ENABLE AS enable
	19	+ ID AS id, SOURCE_ID AS sourceId, VERSION_ID AS versionId, NAME AS name, GROUPNAME AS groupname, GROUPORDER AS grouporder, ITEMORDER AS itemorder, ENABLE AS enable
22	20	</sql>
23	21	</mapper>

	1	+package com.lyms.base.common.dao.conf;
	2	+
	3	+import com.lyms.base.common.entity.conf.DiagnoseMaps;
	4	+import com.baomidou.mybatisplus.mapper.BaseMapper;
	5	+import org.springframework.stereotype.Repository;
	6	+import java.io.Serializable;
	7	+import java.util.List;
	8	+/**
	9	+ * <p>
	10	+ * Mapper接口
	11	+ * </p>
	12	+ *
	13	+ * @author fangcheng
	14	+ * @since 2017-03-30
	15	+ */
	16	+@Repository
	17	+public interface DiagnoseMapsMapper extends BaseMapper<DiagnoseMaps> {
	18	+
	19	+ public Integer deleteLogicById(Serializable id);
	20	+
	21	+ public List<DiagnoseMaps> selectByDiagnoseId(Serializable id);
	22	+
	23	+}

	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	3	+<mapper namespace="com.lyms.base.common.dao.conf.DiagnoseMapsMapper">
	4	+
	5	+ <!-- 通用查询映射结果 -->
	6	+ <resultMap id="BaseResultMap" type="com.lyms.base.common.entity.conf.DiagnoseMaps">
	7	+ <result column="ID" property="id" />
	8	+ <result column="DIAGNOSE_ID" property="diagnoseId" />
	9	+ <result column="SOURCE_ID" property="sourceId" />
	10	+ </resultMap>
	11	+
	12	+ <!-- 通用查询映射结果 -->
	13	+ <resultMap id="MapsResultMap" type="com.lyms.base.common.entity.conf.DiagnoseMaps">
	14	+ <result column="ID" property="id" />
	15	+ <result column="DIAGNOSE_ID" property="diagnoseId" />
	16	+ <result column="SOURCE_ID" property="sourceId" />
	17	+ <result column="NAME" property="name" />
	18	+ <result column="GROUPNAME" property="groupname" />
	19	+ <result column="GROUPORDER" property="grouporder" />
	20	+ <result column="ITEMORDER" property="itemorder" />
	21	+ </resultMap>
	22	+
	23	+ <!-- 通用查询结果列 -->
	24	+ <sql id="Base_Column_List">
	25	+ ID AS id, DIAGNOSE_ID AS diagnoseId, SOURCE_ID AS sourceId
	26	+ </sql>
	27	+
	28	+ <!-- 关系查询结果列 -->
	29	+ <sql id="Maps_Column_List">
	30	+ m.ID AS id, m.DIAGNOSE_ID AS diagnoseId, m.SOURCE_ID AS sourceId,
	31	+ NAME AS name, GROUPNAME AS groupname, GROUPORDER AS grouporder, ITEMORDER AS itemorder
	32	+ </sql>
	33	+
	34	+ <!-- 根据uid获取用户的权限列表-->
	35	+ <select id="selectByDiagnoseId" resultMap="MapsResultMap">
	36	+ select
	37	+ <include refid="Maps_Column_List"></include>
	38	+ from DIAGNOSE_MAPS m left join DIAGNOSE_CONF c on m.SOURCE_ID = c.SOURCE_ID where m.DIAGNOSE_ID = #{id}
	39	+ </select>
	40	+</mapper>

	1	+package com.lyms.base.common.dao.conf;
	2	+
	3	+import com.lyms.base.common.entity.conf.HighriskMaps;
	4	+import com.baomidou.mybatisplus.mapper.BaseMapper;
	5	+import org.springframework.stereotype.Repository;
	6	+import java.io.Serializable;
	7	+import java.util.List;
	8	+/**
	9	+ * <p>
	10	+ * Mapper接口
	11	+ * </p>
	12	+ *
	13	+ * @author fangcheng
	14	+ * @since 2017-03-30
	15	+ */
	16	+@Repository
	17	+public interface HighriskMapsMapper extends BaseMapper<HighriskMaps> {
	18	+
	19	+ public Integer deleteLogicById(Serializable id);
	20	+
	21	+ public List<HighriskMaps> selectByDiagnoseId(Serializable id);
	22	+
	23	+}

	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
	3	+<mapper namespace="com.lyms.base.common.dao.conf.HighriskMapsMapper">
	4	+
	5	+ <!-- 通用查询映射结果 -->
	6	+ <resultMap id="BaseResultMap" type="com.lyms.base.common.entity.conf.HighriskMaps">
	7	+ <result column="ID" property="id" />
	8	+ <result column="DIAGNOSE_ID" property="diagnoseId" />
	9	+ <result column="SOURCE_ID" property="sourceId" />
	10	+ </resultMap>
	11	+
	12	+ <!-- 通用查询映射结果 -->
	13	+ <resultMap id="HighriskMapsResult" type="com.lyms.base.common.entity.conf.HighriskMaps">
	14	+ <result column="ID" property="id" />
	15	+ <result column="DIAGNOSE_ID" property="diagnoseId" />
	16	+ <result column="SOURCE_ID" property="sourceId" />
	17	+ <result column="NAME" property="name" />
	18	+ <result column="COLORCODE" property="colorcode" />
	19	+ <result column="COLORTEXT" property="colortext" />
	20	+ <result column="GROUPORDER" property="grouporder" />
	21	+ <result column="ITEMORDER" property="itemorder" />
	22	+ <result column="GRADE" property="grade" />
	23	+ </resultMap>
	24	+
	25	+ <!-- 通用查询结果列 -->
	26	+ <sql id="Base_Column_List">
	27	+ ID AS id, DIAGNOSE_ID AS diagnoseId, SOURCE_ID AS sourceId
	28	+ </sql>
	29	+
	30	+ <!-- 关系查询结果列 -->
	31	+ <sql id="Maps_Column_List">
	32	+ m.ID AS id, m.DIAGNOSE_ID AS diagnoseId, m.SOURCE_ID AS sourceId,
	33	+ NAME AS name, COLORCODE AS colorcode, COLORTEXT AS colortext, GROUPORDER AS grouporder,
	34	+ ITEMORDER AS itemorder, GRADE AS grade
	35	+ </sql>
	36	+
	37	+ <!-- 根据uid获取用户的权限列表-->
	38	+ <select id="selectByDiagnoseId" resultMap="HighriskMapsResult">
	39	+ select
	40	+ <include refid="Maps_Column_List"></include>
	41	+ from HIGHRISK_MAPS m left join HIGHRISK_CONF c on m.SOURCE_ID = c.SOURCE_ID where m.DIAGNOSE_ID = #{id}
	42	+ </select>
	43	+</mapper>

1	1	package com.lyms.base.common.entity.conf;
2	2
3		-import java.io.Serializable;
4		-
	3	+import com.baomidou.mybatisplus.annotations.TableId;
5	4	import com.baomidou.mybatisplus.annotations.TableField;
6	5	import com.baomidou.mybatisplus.annotations.TableName;
	6	+import java.io.Serializable;
7	7
8	8	/**
9	9	* <p>
10	10	* 区域组诊断版本项配置表
11	11	* </p>
12	12	*
13		- * @author maliang
14		- * @since 2017-03-28
	13	+ * @author fangcheng
	14	+ * @since 2017-03-30
15	15	*/
16	16	@TableName("DIAGNOSE_CONF")
17	17	public class DiagnoseConf implements Serializable {
18	18
19		- private static final long serialVersionUID = 1L;
	19	+ private static final long serialVersionUID = 1L;
20	20
21	21	/**
22	22	*
23	23	*/
24		- @TableField(value = "ID")
	24	+ @TableId(value="ID")
25	25	private String id;
26	26	/**
27	27	* 高危项定义资源表ID
28	28	*/
29		- @TableField(value = "SOURCE_ID")
	29	+ @TableField(value="SOURCE_ID")
30	30	private String sourceId;
31	31	/**
32	32	* 版本ID
33	33	*/
34		- @TableField(value = "VERSION_ID")
	34	+ @TableField(value="VERSION_ID")
35	35	private String versionId;
36	36	/**
37	37	* 自定义高危显示名
38	38	*/
39		- @TableField(value = "NAME")
	39	+ @TableField(value="NAME")
40	40	private String name;
41	41	/**
42	42	* 自定义高危颜色编码
43	43	*/
44		- @TableField(value = "COLORCODE")
45		- private String colorcode;
	44	+ @TableField(value="GROUPNAME")
	45	+ private String groupname;
46	46	/**
47		- * 自定义高危颜色描述
48		- */
49		- @TableField(value = "COLORTEXT")
50		- private String colortext;
51		- /**
52	47	* 高危组排序
53	48	*/
54		- @TableField(value = "GROUPORDER")
	49	+ @TableField(value="GROUPORDER")
55	50	private String grouporder;
56	51	/**
57	52	* 高危项排序
58	53	*/
59		- @TableField(value = "ITEMORDER")
	54	+ @TableField(value="ITEMORDER")
60	55	private String itemorder;
61	56	/**
62		- * 自定义评分
63		- */
64		- @TableField(value = "GRADE")
65		- private String grade;
66		- /**
67	57	* 是否启用，默认1启用
68	58	*/
69		- @TableField(value = "ENABLE")
70		- private String enable;
	59	+ @TableField(value="ENABLE")
	60	+ private Integer enable;
71	61
	62	+
72	63	public String getId() {
73	64	return id;
74	65	}
75	66
76	67
...	...	@@ -101,22 +92,14 @@
101	92	this.name = name;
102	93	}
103	94
104		- public String getColorcode() {
105		- return colorcode;
	95	+ public String getGroupname() {
	96	+ return groupname;
106	97	}
107	98
108		- public void setColorcode(String colorcode) {
109		- this.colorcode = colorcode;
	99	+ public void setGroupname(String groupname) {
	100	+ this.groupname = groupname;
110	101	}
111	102
112		- public String getColortext() {
113		- return colortext;
114		- }
115		-
116		- public void setColortext(String colortext) {
117		- this.colortext = colortext;
118		- }
119		-
120	103	public String getGrouporder() {
121	104	return grouporder;
122	105	}
123	106
...	...	@@ -133,19 +116,11 @@
133	116	this.itemorder = itemorder;
134	117	}
135	118
136		- public String getGrade() {
137		- return grade;
138		- }
139		-
140		- public void setGrade(String grade) {
141		- this.grade = grade;
142		- }
143		-
144		- public String getEnable() {
	119	+ public Integer getEnable() {
145	120	return enable;
146	121	}
147	122
148		- public void setEnable(String enable) {
	123	+ public void setEnable(Integer enable) {
149	124	this.enable = enable;
150	125	}
151	126

	1	+package com.lyms.base.common.entity.conf;
	2	+
	3	+import com.baomidou.mybatisplus.annotations.TableId;
	4	+import com.baomidou.mybatisplus.annotations.TableField;
	5	+import com.baomidou.mybatisplus.annotations.TableName;
	6	+import java.io.Serializable;
	7	+
	8	+/**
	9	+ * <p>
	10	+ * 诊断结果表
	11	+ * </p>
	12	+ *
	13	+ * @author fangcheng
	14	+ * @since 2017-03-30
	15	+ */
	16	+@TableName("DIAGNOSE_MAPS")
	17	+public class DiagnoseMaps implements Serializable {
	18	+
	19	+ private static final long serialVersionUID = 1L;
	20	+
	21	+ /**
	22	+ *
	23	+ */
	24	+ @TableField(value="ID")
	25	+ private String id;
	26	+ /**
	27	+ * 诊断ID
	28	+ */
	29	+ @TableField(value="DIAGNOSE_ID")
	30	+ private String diagnoseId;
	31	+ /**
	32	+ * 诊断项资源ID
	33	+ */
	34	+ @TableField(value="SOURCE_ID")
	35	+ private String sourceId;
	36	+
	37	+
	38	+ public String getId() {
	39	+ return id;
	40	+ }
	41	+
	42	+ public void setId(String id) {
	43	+ this.id = id;
	44	+ }
	45	+
	46	+ public String getDiagnoseId() {
	47	+ return diagnoseId;
	48	+ }
	49	+
	50	+ public void setDiagnoseId(String diagnoseId) {
	51	+ this.diagnoseId = diagnoseId;
	52	+ }
	53	+
	54	+ public String getSourceId() {
	55	+ return sourceId;
	56	+ }
	57	+
	58	+ public void setSourceId(String sourceId) {
	59	+ this.sourceId = sourceId;
	60	+ }
	61	+
	62	+}

	1	+package com.lyms.base.common.entity.conf;
	2	+
	3	+import com.baomidou.mybatisplus.annotations.TableId;
	4	+import com.baomidou.mybatisplus.annotations.TableField;
	5	+import com.baomidou.mybatisplus.annotations.TableName;
	6	+import java.io.Serializable;
	7	+
	8	+/**
	9	+ * <p>
	10	+ * 高危诊断结果表
	11	+ * </p>
	12	+ *
	13	+ * @author fangcheng
	14	+ * @since 2017-03-30
	15	+ */
	16	+@TableName("HIGHRISK_MAPS")
	17	+public class HighriskMaps implements Serializable {
	18	+
	19	+ private static final long serialVersionUID = 1L;
	20	+
	21	+ /**
	22	+ *
	23	+ */
	24	+ @TableId(value="ID")
	25	+ private String id;
	26	+ /**
	27	+ * 诊断ID
	28	+ */
	29	+ @TableField(value="DIAGNOSE_ID")
	30	+ private String diagnoseId;
	31	+ /**
	32	+ * 高危项定义资源表ID
	33	+ */
	34	+ @TableField(value="SOURCE_ID")
	35	+ private String sourceId;
	36	+
	37	+ @TableField(value = "NAME")
	38	+ private String name;
	39	+ /**
	40	+ * 自定义高危颜色编码
	41	+ */
	42	+ @TableField(value = "COLORCODE")
	43	+ private String colorcode;
	44	+ /**
	45	+ * 自定义高危颜色描述
	46	+ */
	47	+ @TableField(value = "COLORTEXT")
	48	+ private String colortext;
	49	+ /**
	50	+ * 高危组排序
	51	+ */
	52	+ @TableField(value = "GROUPORDER")
	53	+ private Integer grouporder;
	54	+ /**
	55	+ * 高危项排序
	56	+ */
	57	+ @TableField(value = "ITEMORDER")
	58	+ private Integer itemorder;
	59	+ /**
	60	+ * 自定义评分
	61	+ */
	62	+ @TableField(value = "GRADE")
	63	+ private Double grade;
	64	+
	65	+
	66	+ public String getId() {
	67	+ return id;
	68	+ }
	69	+
	70	+ public void setId(String id) {
	71	+ this.id = id;
	72	+ }
	73	+
	74	+ public String getDiagnoseId() {
	75	+ return diagnoseId;
	76	+ }
	77	+
	78	+ public void setDiagnoseId(String diagnoseId) {
	79	+ this.diagnoseId = diagnoseId;
	80	+ }
	81	+
	82	+ public String getSourceId() {
	83	+ return sourceId;
	84	+ }
	85	+
	86	+ public void setSourceId(String sourceId) {
	87	+ this.sourceId = sourceId;
	88	+ }
	89	+
	90	+ public String getName() {
	91	+ return name;
	92	+ }
	93	+
	94	+ public void setName(String name) {
	95	+ this.name = name;
	96	+ }
	97	+
	98	+ public String getColorcode() {
	99	+ return colorcode;
	100	+ }
	101	+
	102	+ public void setColorcode(String colorcode) {
	103	+ this.colorcode = colorcode;
	104	+ }
	105	+
	106	+ public String getColortext() {
	107	+ return colortext;
	108	+ }
	109	+
	110	+ public void setColortext(String colortext) {
	111	+ this.colortext = colortext;
	112	+ }
	113	+
	114	+ public Integer getGrouporder() {
	115	+ return grouporder;
	116	+ }
	117	+
	118	+ public void setGrouporder(Integer grouporder) {
	119	+ this.grouporder = grouporder;
	120	+ }
	121	+
	122	+ public Integer getItemorder() {
	123	+ return itemorder;
	124	+ }
	125	+
	126	+ public void setItemorder(Integer itemorder) {
	127	+ this.itemorder = itemorder;
	128	+ }
	129	+
	130	+ public Double getGrade() {
	131	+ return grade;
	132	+ }
	133	+
	134	+ public void setGrade(Double grade) {
	135	+ this.grade = grade;
	136	+ }
	137	+
	138	+
	139	+
	140	+}

	1	+package com.lyms.base.common.service.conf;
	2	+
	3	+import com.lyms.base.common.entity.conf.DiagnoseMaps;
	4	+import com.lyms.base.common.entity.conf.HighriskMaps;
	5	+import com.lyms.web.service.BaseService;
	6	+import java.io.Serializable;
	7	+import java.util.List;
	8	+
	9	+/**
	10	+ * <p>
	11	+ * 服务类
	12	+ * </p>
	13	+ *
	14	+ * @author fangcheng
	15	+ * @since 2017-03-30
	16	+ */
	17	+public interface DiagnoseMapsService extends BaseService<DiagnoseMaps> {
	18	+
	19	+ /**
	20	+ * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
	21	+ * <li>@param id 删除主键id
	22	+ * <li>@return 大于0修改成功，否则为失败
	23	+ */
	24	+ public Integer deleteLogicById(Serializable id);
	25	+
	26	+ /**
	27	+ * <li>@Description:根据初诊、复诊id获取诊断结果
	28	+ * <li>@param id
	29	+ * <li>@return
	30	+ * <li>创建人：方承
	31	+ * <li>创建时间：2017年3月30日
	32	+ * <li>修改人：
	33	+ * <li>修改时间：
	34	+ */
	35	+ public List<DiagnoseMaps> selectByDiagnoseId(Serializable id);
	36	+
	37	+}

	1	+package com.lyms.base.common.service.conf;
	2	+
	3	+import com.lyms.base.common.entity.conf.HighriskMaps;
	4	+import com.lyms.web.service.BaseService;
	5	+import java.io.Serializable;
	6	+import java.util.List;
	7	+
	8	+/**
	9	+ * <p>
	10	+ * 服务类
	11	+ * </p>
	12	+ *
	13	+ * @author fangcheng
	14	+ * @since 2017-03-30
	15	+ */
	16	+public interface HighriskMapsService extends BaseService<HighriskMaps> {
	17	+
	18	+ /**
	19	+ * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
	20	+ * <li>@param id 删除主键id
	21	+ * <li>@return 大于0修改成功，否则为失败
	22	+ */
	23	+ public Integer deleteLogicById(Serializable id);
	24	+
	25	+ /**
	26	+ * <li>@Description:根据初诊、复诊id获取
	27	+ * <li>@param id
	28	+ * <li>@return
	29	+ * <li>创建人：方承
	30	+ * <li>创建时间：2017年3月30日
	31	+ * <li>修改人：
	32	+ * <li>修改时间：
	33	+ */
	34	+ public List<HighriskMaps> selectByDiagnoseId(Serializable id);
	35	+
	36	+}

	1	+package com.lyms.base.common.service.conf.impl;
	2	+
	3	+import com.lyms.base.common.entity.conf.DiagnoseMaps;
	4	+import com.lyms.base.common.entity.conf.HighriskMaps;
	5	+import com.lyms.base.common.dao.conf.DiagnoseMapsMapper;
	6	+import com.lyms.base.common.service.conf.DiagnoseMapsService;
	7	+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
	8	+import org.springframework.stereotype.Service;
	9	+import java.io.Serializable;
	10	+import java.util.List;
	11	+
	12	+/**
	13	+ * <p>
	14	+ * 诊断结果表服务实现类
	15	+ * </p>
	16	+ *
	17	+ * @author fangcheng
	18	+ * @since 2017-03-30
	19	+ */
	20	+@Service
	21	+public class DiagnoseMapsServiceImpl extends ServiceImpl<DiagnoseMapsMapper, DiagnoseMaps> implements DiagnoseMapsService {
	22	+
	23	+ public Integer deleteLogicById(Serializable id){
	24	+ return baseMapper.deleteLogicById(id);
	25	+ }
	26	+
	27	+ @Override
	28	+ public List<DiagnoseMaps> selectByDiagnoseId(Serializable id) {
	29	+ return baseMapper.selectByDiagnoseId(id);
	30	+ }
	31	+}

	1	+package com.lyms.base.common.service.conf.impl;
	2	+
	3	+import com.lyms.base.common.entity.conf.HighriskMaps;
	4	+import com.lyms.base.common.dao.conf.HighriskMapsMapper;
	5	+import com.lyms.base.common.service.conf.HighriskMapsService;
	6	+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
	7	+import org.springframework.stereotype.Service;
	8	+import java.io.Serializable;
	9	+import java.util.List;
	10	+
	11	+/**
	12	+ * <p>
	13	+ * 高危诊断结果表服务实现类
	14	+ * </p>
	15	+ *
	16	+ * @author fangcheng
	17	+ * @since 2017-03-30
	18	+ */
	19	+@Service
	20	+public class HighriskMapsServiceImpl extends ServiceImpl<HighriskMapsMapper, HighriskMaps> implements HighriskMapsService {
	21	+
	22	+ public Integer deleteLogicById(Serializable id){
	23	+ return baseMapper.deleteLogicById(id);
	24	+ }
	25	+
	26	+ @Override
	27	+ public List<HighriskMaps> selectByDiagnoseId(Serializable id) {
	28	+ return baseMapper.selectByDiagnoseId(id);
	29	+ }
	30	+}

	1	+package test.hospital.diagnose;
	2	+
	3	+import org.junit.Test;
	4	+import org.springframework.beans.factory.annotation.Autowired;
	5	+
	6	+import com.lyms.base.common.entity.conf.DiagnoseMaps;
	7	+import com.lyms.base.common.service.conf.DiagnoseMapsService;
	8	+import com.lyms.util.StrUtils;
	9	+
	10	+import test.hospital.BaseServiceTest;
	11	+
	12	+public class DiagnoseMapsTest extends BaseServiceTest{
	13	+
	14	+ @Autowired
	15	+ private DiagnoseMapsService diagnoseMapsService;
	16	+
	17	+ /**
	18	+ * <li>@Description:根据诊断id获取所有诊断项
	19	+ * <li>
	20	+ * <li>创建人：方承
	21	+ * <li>创建时间：2017年3月29日
	22	+ * <li>修改人：
	23	+ * <li>修改时间：
	24	+ */
	25	+ @Test
	26	+ public void selectByDiagnoseId(){
	27	+ outJson(diagnoseMapsService.selectByDiagnoseId("1"));
	28	+ }
	29	+
	30	+ @Test
	31	+ public void insert(){
	32	+ DiagnoseMaps entity = new DiagnoseMaps();
	33	+ entity.setId(StrUtils.uuid());
	34	+ entity.setDiagnoseId("1");
	35	+ entity.setSourceId("123");
	36	+ diagnoseMapsService.insert(entity);
	37	+ }
	38	+}

	1	+package test.hospital.highrisk;
	2	+
	3	+import org.junit.Test;
	4	+import org.springframework.beans.factory.annotation.Autowired;
	5	+
	6	+import com.lyms.base.common.entity.conf.HighriskMaps;
	7	+import com.lyms.base.common.service.conf.HighriskMapsService;
	8	+import com.lyms.util.StrUtils;
	9	+
	10	+import antlr.StringUtils;
	11	+import test.hospital.BaseServiceTest;
	12	+
	13	+public class HighriskMapsTest extends BaseServiceTest{
	14	+
	15	+ @Autowired
	16	+ private HighriskMapsService highriskMapsService;
	17	+
	18	+ /**
	19	+ * <li>@Description:根据诊断id获取所有高危项
	20	+ * <li>
	21	+ * <li>创建人：方承
	22	+ * <li>创建时间：2017年3月29日
	23	+ * <li>修改人：
	24	+ * <li>修改时间：
	25	+ */
	26	+ @Test
	27	+ public void selectByDiagnoseId(){
	28	+ outJson(highriskMapsService.selectByDiagnoseId("1"));
	29	+ }
	30	+
	31	+ @Test
	32	+ public void insert(){
	33	+ HighriskMaps entity = new HighriskMaps();
	34	+ entity.setId(StrUtils.uuid());
	35	+ entity.setDiagnoseId("1");
	36	+ entity.setSourceId("123");
	37	+ highriskMapsService.insert(entity);
	38	+ }
	39	+}