jiangjiazhi / regional-platform

Commit 6400ec5604badd62e698b0394ba76e6793ea159b

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update

Showing 8 changed files with 156 additions and 7 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java

...	...	@@ -15,7 +15,7 @@
15	15
16	16	void deleteLisData(LisReportModel model);
17	17
18		- List<LisReportModel> queryLisDataByModel(LisReportModel model);
	18	+ List<LisReportModel> queryLisDataByModel(LisReportQuery model);
19	19
20	20	List<LisReportModel> queryLisDataByLisIdAndHid(LisReportModel model);
21	21
...	...	@@ -32,5 +32,7 @@
32	32	int saveLisDataTemp(LisReportModel models);
33	33
34	34	List<LisReportModel> queryLisDataByStatus(LisReportQuery query);
	35	+
	36	+ List<LisReportModel> queryLisCheckInfo(LisReportQuery query);
35	37	}

...	...	@@ -16,6 +16,10 @@
16	16	private String lisId;
17	17	// 检验报告名称
18	18	private String title;
	19	+
	20	+ // 检验报告名称
	21	+ private List<String> titles;
	22	+
19	23	// 检验报告类型
20	24	private String type;
21	25	// 就诊卡号
...	...	@@ -69,6 +73,13 @@
69	73	//检验明细json
70	74	private String itemJson;
71	75
	76	+ public List<String> getTitles() {
	77	+ return titles;
	78	+ }
	79	+
	80	+ public void setTitles(List<String> titles) {
	81	+ this.titles = titles;
	82	+ }
72	83
73	84	public List<String> getPhones() {
74	85	return phones;

...	...	@@ -12,7 +12,7 @@
12	12
13	13	BaseResponse saveLisData(List<LisReportModel> models);
14	14
15		- List<LisReportModel> queryLisDataByModel(LisReportModel model);
	15	+ List<LisReportModel> queryLisDataByModel(LisReportQuery model);
16	16
17	17	List<LisReportItemModel> queryLisItemByModel(LisReportItemModel query);
18	18
...	...	@@ -25,5 +25,7 @@
25	25	int saveLisDataTemp(LisReportModel models);
26	26
27	27	List<LisReportModel> queryLisDataByStatus(LisReportQuery query);
	28	+
	29	+ List<LisReportModel> queryLisCheckInfo(LisReportQuery query);
28	30	}

...	...	@@ -58,7 +58,7 @@
58	58	}
59	59
60	60	@Override
61		- public List<LisReportModel> queryLisDataByModel(LisReportModel model) {
	61	+ public List<LisReportModel> queryLisDataByModel(LisReportQuery model) {
62	62	return masterLisMapper.queryLisDataByModel(model);
63	63	}
64	64
...	...	@@ -94,6 +94,11 @@
94	94	@Override
95	95	public List<LisReportModel> queryLisDataByStatus(LisReportQuery query) {
96	96	return masterLisMapper.queryLisDataByStatus(query);
	97	+ }
	98	+
	99	+ @Override
	100	+ public List<LisReportModel> queryLisCheckInfo(LisReportQuery query) {
	101	+ return masterLisMapper.queryLisCheckInfo(query);
97	102	}
98	103
99	104

...	...	@@ -2,7 +2,7 @@
2	2	<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3	3	<mapper namespace="com.lyms.platform.permission.dao.master.MasterLisMapper">
4	4
5		- <insert id="saveLisData" parameterType="com.lyms.platform.permission.model.LisReportModel">
	5	+ <insert id="saveLisData" parameterType="com.lyms.platform.permission.model.LisReportQuery">
6	6	INSERT INTO LIS_REPORT_TBL(
7	7	LIS_ID,
8	8	TITLE,
...	...	@@ -120,6 +120,20 @@
120	120	<if test="hospitalId != null and hospitalId != ''">
121	121	AND HOSPITAL_ID = #{hospitalId}
122	122	</if>
	123	+
	124	+ <if test="checkTime != null">
	125	+ AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d')
	126	+ </if>
	127	+
	128	+ <if test="titles.size() !=0 ">
	129	+ AND TITLE IN
	130	+ <foreach collection="titles" item="title"
	131	+ index="index" open="(" close=")" separator=",">
	132	+ #{title}
	133	+ </foreach>
	134	+ </if>
	135	+
	136	+
123	137	UNION
124	138	SELECT
125	139	ID AS id,
126	140
...	...	@@ -157,7 +171,17 @@
157	171	AND HOSPITAL_ID = #{hospitalId}
158	172	</if>
159	173
	174	+ <if test="checkTime != null">
	175	+ AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d')
	176	+ </if>
160	177
	178	+ <if test="titles.size() !=0 ">
	179	+ AND TITLE IN
	180	+ <foreach collection="titles" item="title"
	181	+ index="index" open="(" close=")" separator=",">
	182	+ #{title}
	183	+ </foreach>
	184	+ </if>
161	185
162	186	</select>
163	187

...	...	@@ -212,5 +212,26 @@
212	212
213	213	return lisFacade.updateAppLisStatus(ids);
214	214	}
	215	+
	216	+
	217	+ /**
	218	+ * 儿童检查页面获取指定几项的辅助检查结果
	219	+ * 血常规 (血红蛋白、白细胞计数、血小板计数）
	220	+ * 尿常规 (尿蛋白、尿糖、尿酮体、尿潜血)
	221	+ * @param vcCardNo 就诊卡号
	222	+ * @param phone 手机号码
	223	+ * @param request
	224	+ * @return
	225	+ */
	226	+ @RequestMapping(method = RequestMethod.GET, value = "/getBabyLisAssistCheckInfo")
	227	+ @ResponseBody
	228	+ @TokenRequired
	229	+ public BaseResponse getLisAndRisData(@RequestParam(required = false) String vcCardNo,
	230	+ @RequestParam(required = false) String phone,
	231	+ @RequestParam(required = true) String checkTime,
	232	+ HttpServletRequest request) {
	233	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	234	+ return lisFacade.getBabyLisAssistCheckInfo(vcCardNo, phone,checkTime,loginState.getId());
	235	+ }
215	236	}

...	...	@@ -313,7 +313,7 @@
313	313	}
314	314	}
315	315
316		- LisReportModel model = new LisReportModel();
	316	+ LisReportQuery model = new LisReportQuery();
317	317	model.setVcCardNo(pat.getVcCardNo());
318	318	model.setHospitalId(pat.getHospitalId());
319	319	model.setPhone(pat.getPhone());
...	...	@@ -653,6 +653,89 @@
653	653	patientIds.clear();
654	654
655	655	return lists;
	656	+ }
	657	+
	658	+ public BaseResponse getBabyLisAssistCheckInfo(String vcCardNo, String phone, String checkTime,Integer userId) {
	659	+
	660	+ //根据用户id获取医院ID
	661	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	662	+ LisReportQuery query = new LisReportQuery();
	663	+ List<String> titles = new ArrayList<>();
	664	+ titles.add("尿常规");
	665	+ titles.add("[丙]血常规(24项)");
	666	+ titles.add("血常规(24项)");
	667	+ query.setTitles(titles);
	668	+ query.setPhone(phone);
	669	+ query.setPhone(phone);
	670	+ query.setVcCardNo(vcCardNo);
	671	+ query.setHospitalId(hospitalId);
	672	+ query.setCheckTime(DateUtil.parseYMD(checkTime));
	673	+ List<LisReportModel> lises = lisService.queryLisDataByModel(query);
	674	+ Map<String,Map<String,String>> map = new HashMap<>();
	675	+ if (CollectionUtils.isNotEmpty(lises))
	676	+ {
	677	+ for(LisReportModel model : lises)
	678	+ {
	679	+ if ("尿常规".equals(model.getTitle()))
	680	+ {
	681	+ Map<String,String> map1 = new HashMap<>();
	682	+ String itemJson = model.getItemJson();
	683	+ List<LisReportItemModel> items = JsonUtil.toList(itemJson,LisReportItemModel.class);
	684	+ if (CollectionUtils.isNotEmpty(items))
	685	+ {
	686	+ for(LisReportItemModel item : items)
	687	+ {
	688	+ if ("尿蛋白".equals(item.getName()))
	689	+ {
	690	+ map1.put("ndb",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult());
	691	+ }
	692	+ else if ("尿糖".equals(item.getName()))
	693	+ {
	694	+ map1.put("tn",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult());
	695	+ }
	696	+ else if ("尿酮体".equals(item.getName()))
	697	+ {
	698	+ map1.put("ntt",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult());
	699	+ }
	700	+ else if ("尿潜血".equals(item.getName()))
	701	+ {
	702	+ map1.put("ntx",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult());
	703	+ }
	704	+ }
	705	+ }
	706	+
	707	+ map.put("ncg",map1);
	708	+ }
	709	+ else if ("[丙]血常规(24项)".equals(model.getTitle()) \|\| "血常规(24项".equals(model.getTitle()))
	710	+ {
	711	+ Map<String,String> map1 = new HashMap<>();
	712	+ String itemJson = model.getItemJson();
	713	+ List<LisReportItemModel> items = JsonUtil.toList(itemJson,LisReportItemModel.class);
	714	+ if (CollectionUtils.isNotEmpty(items))
	715	+ {
	716	+ for(LisReportItemModel item : items)
	717	+ {
	718	+ if ("血红蛋白".equals(item.getName()))
	719	+ {
	720	+ map1.put("xhdb",item.getResult());
	721	+ }
	722	+ else if ("白细胞计数".equals(item.getName()))
	723	+ {
	724	+ map1.put("xxbjs",item.getResult());
	725	+ }
	726	+ else if ("血小板计数".equals(item.getName()))
	727	+ {
	728	+ map1.put("xxbjs",item.getResult());
	729	+ }
	730	+ }
	731	+ }
	732	+
	733	+ map.put("xcg",map1);
	734	+ }
	735	+ }
	736	+ }
	737	+
	738	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
656	739	}
657	740	}

...	...	@@ -1265,9 +1265,10 @@
1265	1265
1266	1266	map.put("hospitalId", hospitalId);
1267	1267	map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(data.getNextCheckTime()));
1268		- if (patients.getFmDate() != null)
	1268	+ if (patients.getFmDate() != null && data.getNextCheckTime() != null)
1269	1269	{
1270		- map.put("nextCheckWeek",ResolveUtils.getPregnancyWeek(patients.getFmDate(), data.getNextCheckTime()));
	1270	+ int day = DateUtil.daysBetween(patients.getFmDate(),data.getNextCheckTime());
	1271	+ map.put("nextCheckWeek","产后"+day+"天");
1271	1272	}
1272	1273
1273	1274