jiangjiazhi / regional-platform

Commit e3b82705a3e68881e08d6a7ab0c82d42fd82c079

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 55 additions and 23 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.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

...	...	@@ -24,6 +24,8 @@
24	24	private String type;
25	25	// 就诊卡号
26	26	private String vcCardNo;
	27	+ //儿童社保卡
	28	+ private String sINCard;
27	29
28	30	// 就诊卡号
29	31	private List<String> vcCardNos;
...	...	@@ -73,6 +75,14 @@
73	75	//检验明细json
74	76	private String itemJson;
75	77
	78	+ public String getsINCard() {
	79	+ return sINCard;
	80	+ }
	81	+
	82	+ public void setsINCard(String sINCard) {
	83	+ this.sINCard = sINCard;
	84	+ }
	85	+
76	86	public Integer getId() {
77	87	return id;
78	88	}
...	...	@@ -283,14 +293,35 @@
283	293
284	294	@Override
285	295	public String toString() {
286		- return "LisReportModel [id=" + id + ", lisId=" + lisId + ", title="
287		- + title + ", type=" + type + ", vcCardNo=" + vcCardNo
288		- + ", name=" + name + ", bhnum=" + bhnum + ", age=" + age
289		- + ", sex=" + sex + ", applyTime=" + applyTime + ", checkTime="
290		- + checkTime + ", publishTime=" + publishTime + ", applyDoctor="
291		- + applyDoctor + ", applyDept=" + applyDept + ", checker="
292		- + checker + ", modified=" + modified + ", created=" + created
293		- + ", hospitalId=" + hospitalId + "]";
	296	+ return "LisReportQuery{" +
	297	+ "id=" + id +
	298	+ ", lisId='" + lisId + '\'' +
	299	+ ", title='" + title + '\'' +
	300	+ ", titles=" + titles +
	301	+ ", type='" + type + '\'' +
	302	+ ", vcCardNo='" + vcCardNo + '\'' +
	303	+ ", sINCard='" + sINCard + '\'' +
	304	+ ", vcCardNos=" + vcCardNos +
	305	+ ", name='" + name + '\'' +
	306	+ ", bhnum='" + bhnum + '\'' +
	307	+ ", age='" + age + '\'' +
	308	+ ", sex='" + sex + '\'' +
	309	+ ", applyTime='" + applyTime + '\'' +
	310	+ ", checkTime='" + checkTime + '\'' +
	311	+ ", publishTime='" + publishTime + '\'' +
	312	+ ", applyDoctor='" + applyDoctor + '\'' +
	313	+ ", applyDept='" + applyDept + '\'' +
	314	+ ", checker='" + checker + '\'' +
	315	+ ", modified='" + modified + '\'' +
	316	+ ", created='" + created + '\'' +
	317	+ ", hospitalId='" + hospitalId + '\'' +
	318	+ ", hospitalIds=" + hospitalIds +
	319	+ ", phone='" + phone + '\'' +
	320	+ ", phones=" + phones +
	321	+ ", items=" + items +
	322	+ ", status=" + status +
	323	+ ", itemJson='" + itemJson + '\'' +
	324	+ '}';
294	325	}
295	326	}

...	...	@@ -111,10 +111,9 @@
111	111	<if test="lisId != null and lisId != ''">
112	112	AND LIS_ID = #{lisId}
113	113	</if>
114		- <if test="vcCardNo != null and vcCardNo != ''">
115		- AND VCCARDNO = #{vcCardNo}
	114	+ <if test="(vcCardNo != null and vcCardNo != '') \|\| (sINCard != null and sINCard != '') ">
	115	+ AND VCCARDNO = #{vcCardNo} or VCCARDNO = #{sINCard}
116	116	</if>
117		-
118	117	<if test="vcCardNos != null and vcCardNos.size() !=0 ">
119	118	AND VCCARDNO IN
120	119	<foreach collection="vcCardNos" item="vc"

...	...	@@ -132,12 +132,14 @@
132	132	* @param phone 手机号码
133	133	* @param cardNo 身份证号码
134	134	* @param perType 2-儿童
	135	+ * @param sINCard 儿童社保卡
135	136	* @return
136	137	*/
137	138	@RequestMapping(method = RequestMethod.GET, value = "/getLisAndRisData")
138	139	@ResponseBody
139	140	@TokenRequired
140	141	public BaseResponse getLisAndRisData(@RequestParam(required = false) String vcCardNo,
	142	+ @RequestParam(required = false) String sINCard,
141	143	@RequestParam("sortType") Integer sortType,
142	144	@RequestParam(required = false) String phone,
143	145	@RequestParam(required = false) String cardNo,
...	...	@@ -145,7 +147,7 @@
145	147	@RequestParam(defaultValue = "1") Integer perType,//默认孕妇
146	148	HttpServletRequest request) {
147	149	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
148		- return lisFacade.getLisAndRisData(vcCardNo, phone,cardNo, sortType,perType, userName,loginState.getId());
	150	+ return lisFacade.getLisAndRisData(vcCardNo,sINCard, phone,cardNo, sortType,perType, userName,loginState.getId());
149	151	}
150	152
151	153

...	...	@@ -88,13 +88,13 @@
88	88	* @param perType 2-儿童，其他是孕妇
89	89	* @return
90	90	*/
91		- public BaseResponse getLisAndRisData(String vcCardNo, String phone, String cardNo, Integer sortType, int perType,String userName, Integer userId) {
	91	+ public BaseResponse getLisAndRisData(String vcCardNo,String sINCard, String phone, String cardNo, Integer sortType, int perType,String userName, Integer userId) {
92	92
93	93	List<CheckByDate> checkByDate = new ArrayList<CheckByDate>();
94	94	//根据用户id获取医院ID
95	95	String hospitalId = autoMatchFacade.getHospitalId(userId);
96	96
97		- List<CheckResponse> result = queryLisCheckList(vcCardNo, phone, hospitalId, cardNo, perType, userName);
	97	+ List<CheckResponse> result = queryLisCheckList(vcCardNo,sINCard, phone, hospitalId, cardNo, perType, userName);
98	98
99	99	//排序检查大项
100	100	sortLis(result);
...	...	@@ -232,7 +232,7 @@
232	232	* @param perType 2-儿童
233	233	* @return
234	234	*/
235		- public List<CheckResponse> queryLisCheckList(String vcCardNo, String phone, String hospitalId, String cardNo, int perType,String userName) {
	235	+ public List<CheckResponse> queryLisCheckList(String vcCardNo,String sINCard, String phone, String hospitalId, String cardNo, int perType,String userName) {
236	236
237	237	//保存这个人在所有医院的lis记录
238	238	List<CheckResponse> result = new ArrayList<>();
...	...	@@ -256,7 +256,7 @@
256	256	if (perType == 2) {//儿童
257	257	model.setHospitalId(hospitalId);
258	258	//通过就诊卡号和医院id查询到医院下面的lis记录
259		- lises = queryLisData(vcCardNo, "", "",perType, model);
	259	+ lises = queryLisData(vcCardNo, sINCard,"", "",perType, model);
260	260	}
261	261	else if (perType == 3)
262	262	{
...	...	@@ -269,7 +269,7 @@
269	269	{
270	270	//通过就诊卡号和医院id查询到医院下面的lis记录
271	271	model.setHospitalId("2100001580");
272		- lises = queryLisData(vcCardNo, phone, cardNo,perType, model);
	272	+ lises = queryLisData(vcCardNo,null, phone, cardNo,perType, model);
273	273	}
274	274	else
275	275	{
...	...	@@ -309,7 +309,7 @@
309	309	}
310	310	model.setHospitalId(pat.getHospitalId());
311	311	//通过就诊卡号和医院id查询到医院下面的lis记录
312		- lises = queryLisData(pat.getVcCardNo(), pat.getPhone(), pat.getCardNo(),perType, model);
	312	+ lises = queryLisData(pat.getVcCardNo(),null, pat.getPhone(), pat.getCardNo(),perType, model);
313	313	}
314	314	}
315	315	}
316	316
...	...	@@ -390,11 +390,11 @@
390	390	* @param model
391	391	* @return
392	392	*/
393		- private List<LisReportModel> queryLisData(String vcCardNo, String phone, String cardNo,int perType, LisReportQuery model) {
	393	+ private List<LisReportModel> queryLisData(String vcCardNo,String sINCard, String phone, String cardNo,int perType, LisReportQuery model) {
394	394
395	395	List<LisReportModel> reportModelList = new ArrayList<>();
396	396	//通过就诊卡号和医院id查询到医院下面的lis记录
397		- if (StringUtils.isNotEmpty(vcCardNo) \|\| StringUtils.isNotEmpty(cardNo)) {
	397	+ if (StringUtils.isNotEmpty(vcCardNo) \|\| StringUtils.isNotEmpty(sINCard) \|\| StringUtils.isNotEmpty(cardNo)) {
398	398	//德州市妇幼
399	399	if ("1000000114".equals(model.getHospitalId())) {
400	400	model.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo));
401	401
...	...	@@ -438,10 +438,10 @@
438	438	// else if("2100001605".equals(model.getHospitalId())){
439	439	// model.setVcCardNo(cardNo); //TODO
440	440	// }
441		- else if (StringUtils.isNotEmpty(vcCardNo)) {
	441	+ else if (StringUtils.isNotEmpty(vcCardNo) \|\| StringUtils.isNotEmpty(sINCard)) {
442	442	model.setVcCardNo(vcCardNo);
443		- }
444		- else if (StringUtils.isNotEmpty(cardNo))
	443	+ model.setsINCard(sINCard);
	444	+ } else if (StringUtils.isNotEmpty(cardNo))
445	445	{
446	446	model.setVcCardNo(cardNo);
447	447	}