jiangjiazhi / regional-platform

Commit 3eca03f88a899454377a67122d84bd55f4c1e5b0

Authored by yangfei almost 7 years ago

Exists in master and in 6 other branches

产检增加本院就诊卡号

Showing 7 changed files with 66 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java

...	...	@@ -339,7 +339,7 @@
339	339	addTrackDownInfo(userId, patients);
340	340	}
341	341	//自动数据处理
342		- updateAutoData(model, hospitalId);
	342	+ updateAutoData(model, antExAddRequest,hospitalId);
343	343	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
344	344	}
345	345
...	...	@@ -349,7 +349,7 @@
349	349	* @param antExamModel
350	350	* @param hospitalId
351	351	*/
352		- public void updateAutoData(final AntenatalExaminationModel antExamModel, final String hospitalId) {
	352	+ public void updateAutoData(final AntenatalExaminationModel antExamModel,final AntExAddRequest antExAddRequest, final String hospitalId) {
353	353	commonThreadPool.execute(new Runnable() {
354	354	@Override
355	355	public void run() {
...	...	@@ -358,6 +358,7 @@
358	358	if (antExamModel.getSendMsg() != null && antExamModel.getSendMsg()) {
359	359	Patients patients = patientsService.findOnePatientById(antExamModel.getParentId());
360	360	if (patients != null) {
	361	+ patients.setVcCardNo(antExAddRequest.getVcCardNo());
361	362	//发送推送消息
362	363	patients.setSendMsgTime(new Date());
363	364	patientsService.updatePatient(patients);
...	...	@@ -816,6 +817,8 @@
816	817	if (excAddRequest.getIsSendMsg()) {
817	818	patients.setSendMsgTime(new Date());
818	819	}
	820	+ //本院就诊卡号
	821	+ patients.setVcCardNo(excAddRequest.getVcCardNo());
819	822	patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor());
820	823	patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId());
821	824	patientsService.updatePatient(patients);
822	825
823	826
...	...	@@ -2321,18 +2324,21 @@
2321	2324	PatientsQuery patientsQuery = new PatientsQuery();
2322	2325	if (StringUtils.isNotEmpty(cardNo)) {
2323	2326	patientsQuery.setCardNo(cardNo);
2324		- } else if (StringUtils.isNotEmpty(vcCardNo)) {
	2327	+ } else if (StringUtils.isNotEmpty(id)) {
	2328	+ patientsQuery.setId(id);
	2329	+ } else if (StringUtils.isNotEmpty(pid)) {
	2330	+ patientsQuery.setPid(pid);
	2331	+ }
	2332	+
	2333	+ if (StringUtils.isNotEmpty(vcCardNo)) {
2325	2334	//德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号）查询出对应的用过的卡号 add lqy
2326	2335	if ("1000000114".equals(hospitalId)) {
2327	2336	patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo));
2328	2337	} else {
2329	2338	patientsQuery.setVcCardNo(vcCardNo);
2330	2339	}
2331		- } else if (StringUtils.isNotEmpty(id)) {
2332		- patientsQuery.setId(id);
2333		- } else if (StringUtils.isNotEmpty(pid)) {
2334		- patientsQuery.setPid(pid);
2335	2340	}
	2341	+
2336	2342	patientsQuery.setType(type);
2337	2343	patientsQuery.setHospitalList(hospitalId);
2338	2344	patientsQuery.setYn(YnEnums.YES.getId());
...	...	@@ -2728,7 +2734,6 @@
2728	2734	Assert.notNull(examinationModel, "id不存在.");
2729	2735	AntenatalExaminationResult antenatalExaminationResult = new AntenatalExaminationResult();
2730	2736	antenatalExaminationResult.convertToResult(examinationModel);
2731		-
2732	2737	try {
2733	2738	//筛查结果
2734	2739	if (CollectionUtils.isNotEmpty(examinationModel.getScreenResult())) {
...	...	@@ -2765,7 +2770,7 @@
2765	2770	if (null != data) {
2766	2771	data = patients.getLastMenses();
2767	2772	}
2768		-
	2773	+ antenatalExaminationResult.setVcCardNo(patients.getVcCardNo());
2769	2774	String doctorId = examinationModel.getCheckDoctor();
2770	2775	if (StringUtils.isNotEmpty(doctorId)) {
2771	2776	Users users = usersService.getUsers(Integer.valueOf(doctorId));
...	...	@@ -2838,6 +2843,7 @@
2838	2843	mensDay += patients.getMensEndDay();
2839	2844	}
2840	2845	antexChuResult.setMensDay(mensDay);
	2846	+ antexChuResult.setVcCardNo(patients.getVcCardNo());
2841	2847	}
2842	2848
2843	2849	antexChuResult.convertToResult(antExChuModel);

...	...	@@ -1199,6 +1199,7 @@
1199	1199	Map<String, Object> map = new HashMap<>();
1200	1200	/*新增字段*/
1201	1201	map.put("ttita", data.getTtita());
	1202	+ map.put("vcCardNo", patients.getVcCardNo());
1202	1203	map.put("totalThy", data.getTotalThy());
1203	1204	map.put("ftita", data.getFtita());
1204	1205	map.put("freeThy", data.getFreeThy());
...	...	@@ -1916,6 +1917,7 @@
1916	1917	Map<String, Object> map = new HashMap<>();
1917	1918
1918	1919	/*新增字段*/
	1920	+ map.put("vcCardNo", patients.getVcCardNo());
1919	1921	map.put("ttita", data.getTtita());
1920	1922	map.put("totalThy", data.getTotalThy());
1921	1923	map.put("ftita", data.getFtita());

...	...	@@ -33,8 +33,8 @@
33	33	/** 胎动情况 */
34	34	private String quicken;
35	35	private String quickenRemark;
	36	+ private String vcCardNo;
36	37
37		-
38	38	// 访视记录id
39	39	private String id;
40	40
...	...	@@ -253,6 +253,15 @@
253	253	//
254	254	// //hit抗体检测
255	255	// private String hivkt;
	256	+
	257	+
	258	+ public String getVcCardNo() {
	259	+ return vcCardNo;
	260	+ }
	261	+
	262	+ public void setVcCardNo(String vcCardNo) {
	263	+ this.vcCardNo = vcCardNo;
	264	+ }
256	265
257	266	/承德区域功能***/
258	267

...	...	@@ -31,6 +31,8 @@
31	31	// 是否需要发送
32	32	private boolean isSendMsg;
33	33
	34	+ private String vcCardNo;
	35	+
34	36	//该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
35	37	private String lisCheckItems;
36	38
...	...	@@ -344,6 +346,14 @@
344	346
345	347	//浮肿
346	348	private String edema;
	349	+
	350	+ public String getVcCardNo() {
	351	+ return vcCardNo;
	352	+ }
	353	+
	354	+ public void setVcCardNo(String vcCardNo) {
	355	+ this.vcCardNo = vcCardNo;
	356	+ }
347	357
348	358	public boolean getIsSendMsg() {
349	359	return isSendMsg;

...	...	@@ -55,6 +55,7 @@
55	55	* 胎动
56	56	*/
57	57	private String quicken;
	58	+ private String vcCardNo;
58	59	/**
59	60	* 胎动备注
60	61	*/
...	...	@@ -63,6 +64,14 @@
63	64	private List<Map<String,Object>> screenResult;
64	65	//结果补充
65	66	private String resultSupple;
	67	+
	68	+ public String getVcCardNo() {
	69	+ return vcCardNo;
	70	+ }
	71	+
	72	+ public void setVcCardNo(String vcCardNo) {
	73	+ this.vcCardNo = vcCardNo;
	74	+ }
66	75
67	76	public List<Map<String, Object>> getScreenResult() {
68	77	return screenResult;

...	...	@@ -25,6 +25,15 @@
25	25
26	26	//该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
27	27	private String lisCheckItems;
	28	+ private String vcCardNo;
	29	+
	30	+ public String getVcCardNo() {
	31	+ return vcCardNo;
	32	+ }
	33	+
	34	+ public void setVcCardNo(String vcCardNo) {
	35	+ this.vcCardNo = vcCardNo;
	36	+ }
28	37
29	38	public String getLisCheckItems() {
30	39	return lisCheckItems;

...	...	@@ -69,10 +69,20 @@
69	69	private String lastSendMsg;
70	70	//高危诊断是否开启 0停用，1启用
71	71	private String enableConfig = "0";
	72	+ //医院ID
	73	+ private String hospitalId;
72	74
73	75	//<!---------基本信息----------->
74	76
75	77
	78	+ public String getHospitalId() {
	79	+ return hospitalId;
	80	+ }
	81	+
	82	+ public void setHospitalId(String hospitalId) {
	83	+ this.hospitalId = hospitalId;
	84	+ }
	85	+
76	86	public String getLastSendMsg() {
77	87	return lastSendMsg;
78	88	}
...	...	@@ -300,6 +310,7 @@
300	310	if (null != patients.getDueDate()) {
301	311	setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
302	312	}
	313	+ setHospitalId(patients.getHospitalId());
303	314	setBuildTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
304	315	setName(patients.getUsername());
305	316	setPhone(patients.getPhone());