jiangjiazhi / regional-platform

Commit 4745e0ef46f3a9a4bc374ebf9bc4bf5d945b3b2e

Authored by zhangchao 11 months ago

Exists in dev

#fix:优化产后、产前检查项配置

Showing 4 changed files with 23 additions and 9 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java
platform-biz-service/src/main/resources/mainOrm/master/FactorProjectMapper.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java

...	...	@@ -12,12 +12,21 @@
12	12	private String week;
13	13	private Integer hospitalId;
14	14	private Date created;
	15	+ private String tips;
15	16	//10001是孕周 10002是分娩
16	17	private Integer type;
17	18	@Transient
18	19	private List<ProjectWay> wayList;
19	20	@Transient
20	21	private List<Integer> delIds;
	22	+
	23	+ public String getTips() {
	24	+ return tips;
	25	+ }
	26	+
	27	+ public void setTips(String tips) {
	28	+ this.tips = tips;
	29	+ }
21	30
22	31	public Integer getId() {
23	32	return id;

...	...	@@ -9,6 +9,7 @@
9	9	<result column="hospital_id" property="hospitalId" jdbcType="INTEGER"/>
10	10	<result column="week" property="week" jdbcType="VARCHAR"/>
11	11	<result column="type" property="type" jdbcType="INTEGER"></result>
	12	+ <result column="tips" property="tips" jdbcType="VARCHAR"/>
12	13	<result column="created" property="created" jdbcType="TIMESTAMP"/>
13	14	</resultMap>
14	15	<sql id="orderAndLimit">
...	...	@@ -23,7 +24,7 @@
23	24	parameterType="com.lyms.platform.permission.model.FactorProjectQuery">
24	25	SELECT id,
25	26	risk_factor_name,risk_factor_ids,
26		- week,hospital_id,created,type
	27	+ week,hospital_id,created,type,tips
27	28	FROM lyms_factor_project
28	29	where
29	30	hospital_id = #{hospitalId,jdbcType=INTEGER}
...	...	@@ -43,8 +44,8 @@
43	44	</select>
44	45
45	46	<insert id="add" parameterType="com.lyms.platform.permission.model.FactorProject" useGeneratedKeys="true" keyProperty="id">
46		- INSERT INTO lyms_factor_project(risk_factor_ids,risk_factor_name,week,hospital_id,created,type)
47		- VALUES (#{riskFactorIds},#{riskFactorName},#{week},#{hospitalId},#{created},#{type})
	47	+ INSERT INTO lyms_factor_project(risk_factor_ids,risk_factor_name,week,hospital_id,created,type,tips)
	48	+ VALUES (#{riskFactorIds},#{riskFactorName},#{week},#{hospitalId},#{created},#{type},#{tips})
48	49	</insert>
49	50
50	51
...	...	@@ -66,6 +67,9 @@
66	67	<if test="type!=null">
67	68	type=#{type,jdbcType=INTEGER},
68	69	</if>
	70	+ <if test="tips !=null">
	71	+ tips = #{tips,jdbcType=VARCHAR},
	72	+ </if>
69	73	</set>
70	74	where id = #{id,jdbcType=INTEGER}
71	75	</update>
...	...	@@ -89,7 +93,7 @@
89	93	<select id="selectById" resultMap="FactorProjectMap" parameterType="java.lang.Integer">
90	94	SELECT id,risk_factor_ids,
91	95	risk_factor_name,
92		- week,hospital_id,created,type
	96	+ week,hospital_id,created,type,tips
93	97	FROM lyms_factor_project
94	98	where
95	99	id = #{id,jdbcType=INTEGER}
...	...	@@ -101,6 +105,7 @@
101	105	<result column="risk_factor_ids" property="riskFactorIds" jdbcType="VARCHAR"/>
102	106	<result column="risk_factor_name" property="riskFactorName" jdbcType="VARCHAR"/>
103	107	<result column="week" property="week" jdbcType="VARCHAR"/>
	108	+ <result column="tips" property="tips" jdbcType="VARCHAR"/>
104	109	<result column="type" property="type" jdbcType="INTEGER"></result>
105	110	<result column="created" property="created" jdbcType="TIMESTAMP"/>
106	111	<collection property="wayList" ofType="com.lyms.platform.permission.model.ProjectWay">
...	...	@@ -117,6 +122,7 @@
117	122	fp.id,
118	123	fp.hospital_id,
119	124	fp.type,
	125	+ fp.tips,
120	126	fp.risk_factor_ids,
121	127	fp.risk_factor_name,
122	128	fp.`week`,
...	...	@@ -139,6 +145,7 @@
139	145	fp.risk_factor_ids,
140	146	fp.risk_factor_name,
141	147	fp.`week`,
	148	+ fp.tips,
142	149	fp.type,
143	150	pw.id AS `projectWay.id`,
144	151	pw.way AS `projectWay.way`,

...	...	@@ -220,8 +220,7 @@
220	220	ps.setId(patientService.getId());
221	221	ps.setParentid(patientService.getParentid());
222	222	ps.setSerStatus(1);
223		- //如果是产后默认84
224		- ps.setServiceWeek(84);
	223	+ ps.setServiceWeek(yxzhVO.getWeeks());
225	224	ps.setSerType(20);
226	225	baseResponse = patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor));
227	226	}
228	227
...	...	@@ -253,11 +252,10 @@
253	252	list.add(m2);
254	253	list.add(m3);
255	254	}else if (patients.getType()==3){
256		- //开通产后康复服务默认84
257	255	ps.setPerType(3);
258	256	Map<String,String> m3 = new HashMap<>();
259	257	m3.put("serType","20");
260		- m3.put("serviceWeek","84");
	258	+ m3.put("serviceWeek",yxzhVO.getWeeks()+"");
261	259	list.add(m3);
262	260	}
263	261	ps.setSerInfos(list);

...	...	@@ -443,7 +443,7 @@
443	443	List<Map<String, String>> serInfos = ps.getSerInfos();
444	444	if (CollectionUtils.isNotEmpty(serInfos)) {
445	445	for (Map<String, String> serInfo : serInfos) {
446		- System.out.println(ps.toString());
	446	+ //System.out.println(ps.toString());
447	447	//先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
448	448	PatientServiceQuery patientQuery = new PatientServiceQuery();
449	449	patientQuery.setParentid(ps.getParentid());