jiangjiazhi / regional-platform

Commit adb484d7ccfc04d740e164048d4eea7f3a935783

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

修改新电子病历

Showing 8 changed files with 120 additions and 34 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java
platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
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/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java

...	...	@@ -33,7 +33,7 @@
33	33
34	34	public void findAndModify(MongoQuery referralApplyOrderQuery, ReferralApplyOrderModel orderModel) {
35	35	orderModel.setModified(new Date());
36		- findAndModify(referralApplyOrderQuery.convertToMongoQuery(), orderModel);
	36	+ updateMulti(referralApplyOrderQuery.convertToMongoQuery(), orderModel);
37	37	}
38	38	}

...	...	@@ -65,6 +65,8 @@
65	65	private String applyDoctor;
66	66	//接收日期
67	67	private Date received;
	68	+ //接收医生
	69	+ private String recDoctor;
68	70	//创建时间
69	71	private Date created;
70	72	//修改时间
...	...	@@ -75,6 +77,14 @@
75	77	private Integer type;
76	78
77	79	private Integer serviceType;
	80	+
	81	+ public String getRecDoctor() {
	82	+ return recDoctor;
	83	+ }
	84	+
	85	+ public void setRecDoctor(String recDoctor) {
	86	+ this.recDoctor = recDoctor;
	87	+ }
78	88
79	89	public String getHospitalId() {
80	90	return hospitalId;

...	...	@@ -29,9 +29,18 @@
29	29	private String mname;
30	30	private String communityId;
31	31
	32	+ private Integer buildType;
	33	+
32	34	private Integer[] orServiceStatus;
33	35
	36	+ public Integer getBuildType() {
	37	+ return buildType;
	38	+ }
34	39
	40	+ public void setBuildType(Integer buildType) {
	41	+ this.buildType = buildType;
	42	+ }
	43	+
35	44	/**
36	45	* 是否分配社区
37	46	*/
...	...	@@ -321,6 +330,9 @@
321	330	}
322	331	if (-1 != yn) {
323	332	condition = condition.and("yn", yn, MongoOper.IS);
	333	+ }
	334	+ if (null != buildType) {
	335	+ condition = condition.and("buildType", buildType, MongoOper.IS);
324	336	}
325	337	if (null != areaId) {
326	338	condition = condition.and("areaId", areaId, MongoOper.IS);

...	...	@@ -21,7 +21,7 @@
21	21	private String id;
22	22
23	23	private String parentId;
24		-
	24	+ private String pid;
25	25	/**
26	26	*孕妇名字
27	27	*/
28	28
...	...	@@ -79,7 +79,14 @@
79	79	*/
80	80	private Date lastMensesEnd;
81	81
	82	+ public String getPid() {
	83	+ return pid;
	84	+ }
82	85
	86	+ public void setPid(String pid) {
	87	+ this.pid = pid;
	88	+ }
	89	+
83	90	public Integer getScoreEnd() {
84	91	return scoreEnd;
85	92	}
...	...	@@ -240,6 +247,9 @@
240	247	}
241	248	if(null!=id){
242	249	condition=condition.and("id",id, MongoOper.IS);
	250	+ }
	251	+ if(null!=pid){
	252	+ condition=condition.and("pid",pid, MongoOper.IS);
243	253	}
244	254	if(null!=name){
245	255	condition=condition.and("name",name, MongoOper.LIKE);

...	...	@@ -38,12 +38,14 @@
38	38	*/
39	39	@RequestMapping(method = RequestMethod.POST, value = "/addOrUpBabyCheck")
40	40	@ResponseBody
41		- public BaseResponse addOrUpBabyCheck(@Valid @RequestBody BabyCheckRequest request) {
	41	+ @TokenRequired
	42	+ public BaseResponse addOrUpBabyCheck(@Valid @RequestBody BabyCheckRequest request,HttpServletRequest httpServletRequest) {
42	43	if (request != null && !StringUtils.isEmpty(request.getId()))
43	44	{
44	45	return babyCheckFacade.updateBabyCheck(request);
45	46	}
46		- return babyCheckFacade.addBabyCheck(request);
	47	+ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
	48	+ return babyCheckFacade.addBabyCheck(request,loginState.getId());
47	49	}
48	50
49	51	/**

...	...	@@ -133,6 +133,27 @@
133	133	patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor());
134	134	//修改患者风险等级
135	135	updatePatientRiskLevel(antExChuModel, patients);
	136	+
	137	+ if (null != patients.getBuildType() && patients.getBuildType() == 3) {
	138	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
	139	+ referralApplyOrderQuery.setParentId(patients.getId());
	140	+ String hospital = autoMatchFacade.getHospitalId(userId);
	141	+ referralApplyOrderQuery.setHospitalId(hospital);
	142	+ List<ReferralApplyOrderModel> orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	143	+ if (CollectionUtils.isNotEmpty(orderModelList)) {
	144	+ String outHospitalId = orderModelList.get(0).getOutHospitalId();
	145	+ ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery();
	146	+ referralApplyOrderQuery1.setOutHospitalId(outHospitalId);
	147	+ referralApplyOrderQuery1.setTransferredHospital(hospital);
	148	+ referralApplyOrderQuery1.setPid(patients.getPid());
	149	+
	150	+ ReferralApplyOrderModel model = new ReferralApplyOrderModel();
	151	+ //设置接收时间
	152	+ model.setReceived(new Date());
	153	+ model.setRecDoctor(userId + "");
	154	+ applyOrderService.updateByParentId(referralApplyOrderQuery1, model);
	155	+ }
	156	+ }
136	157	} else {
137	158	List list1 = autoMatchFacade.matchOrgId(userId);
138	159	Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId());
...	...	@@ -303,7 +324,7 @@
303	324	max = listDate.get(0).getDate();
304	325	}
305	326
306		- HighScoreResult highScoreResult = getPatLastRiskByDate(pid, needLevel,min, max);
	327	+ HighScoreResult highScoreResult = getPatLastRiskByDate(pid, needLevel, min, max);
307	328	return highScoreResult;
308	329	}
309	330
310	331
...	...	@@ -315,13 +336,13 @@
315	336	* @param date
316	337	* @return
317	338	*/
318		- public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel, Date min,Date date) {
	339	+ public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel, Date min, Date date) {
319	340	AntExQuery antExQuery = new AntExQuery();
320	341	antExQuery.setPid(pid);
321	342	antExQuery.setYn(YnEnums.YES.getId());
322	343	if (min != null) {
323	344	antExQuery.setStart(min);
324		- }else if(null!=date){
	345	+ } else if (null != date) {
325	346	antExQuery.setEnd(date);
326	347	}
327	348	List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "modified"));
328	349
329	350
...	...	@@ -348,17 +369,17 @@
348	369	if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) {
349	370	map1.put("name", map.get("fxysu"));
350	371
351		- Object idObj1 = map.get("fyyse");
352		- if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
353		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
354		- if (null != basicConfig) {
355		- String name = basicConfig.getName();
356		- if (name.indexOf("预警") > -1) {
357		- name = name.replace("预警", "");
358		- }
359		- map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
	372	+ Object idObj1 = map.get("fyyse");
	373	+ if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
	374	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
	375	+ if (null != basicConfig) {
	376	+ String name = basicConfig.getName();
	377	+ if (name.indexOf("预警") > -1) {
	378	+ name = name.replace("预警", "");
360	379	}
	380	+ map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
361	381	}
	382	+ }
362	383	highScoreResult.getHighRisk().add(map1);
363	384	} else {
364	385	continue;
365	386
366	387
...	...	@@ -424,17 +445,17 @@
424	445	Object obj = map.get("fxysu");
425	446	if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) {
426	447	map1.put("name", map.get("fxysu"));
427		- Object idObj1 = map.get("fyyse");
428		- if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
429		- BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
430		- if (null != basicConfig) {
431		- String name = basicConfig.getName();
432		- if (name.indexOf("预警") > -1) {
433		- name = name.replace("预警", "");
434		- }
435		- map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
	448	+ Object idObj1 = map.get("fyyse");
	449	+ if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
	450	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
	451	+ if (null != basicConfig) {
	452	+ String name = basicConfig.getName();
	453	+ if (name.indexOf("预警") > -1) {
	454	+ name = name.replace("预警", "");
436	455	}
	456	+ map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
437	457	}
	458	+ }
438	459	highScoreResult.getHighRisk().add(map1);
439	460	} else {
440	461	continue;
...	...	@@ -475,7 +496,7 @@
475	496	* @param exListQueryRequest
476	497	* @return
477	498	*/
478		- public BaseResponse findAntExListTwo(AntExListQueryRequest exListQueryRequest,Integer userId) {
	499	+ public BaseResponse findAntExListTwo(AntExListQueryRequest exListQueryRequest, Integer userId) {
479	500	PatientsQuery patientsQuery = new PatientsQuery();
480	501	patientsQuery.setCardNo(exListQueryRequest.getCardNo());
481	502	patientsQuery.setYn(YnEnums.YES.getId());
482	503
...	...	@@ -487,11 +508,11 @@
487	508	Map map = new HashMap();
488	509
489	510	List sortList = new ArrayList();
490		- String hospital=autoMatchFacade.getHospitalId(userId);
	511	+ String hospital = autoMatchFacade.getHospitalId(userId);
491	512	List<SortIn> listDate = new ArrayList();
492	513
493	514	if (CollectionUtils.isNotEmpty(list)) {
494		- Patients patients2= findOnePatient(null,null,null,hospital,-1,false,exListQueryRequest.getPid());
	515	+ Patients patients2 = findOnePatient(null, null, null, hospital, -1, false, exListQueryRequest.getPid());
495	516	antexListResult.convertToResult(null, patients2, null);
496	517
497	518	HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false);
...	...	@@ -1006,7 +1027,7 @@
1006	1027	* @param type 类型 1 孕妇 3 产妇 -1 不区分
1007	1028	* @param outHospital 是否需要查外院
1008	1029	*/
1009		- public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital,String pid) {
	1030	+ public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital, String pid) {
1010	1031	PatientsQuery patientsQuery = new PatientsQuery();
1011	1032	if (StringUtils.isNotEmpty(cardNo)) {
1012	1033	patientsQuery.setCardNo(cardNo);
...	...	@@ -1014,7 +1035,7 @@
1014	1035	patientsQuery.setVcCardNo(vcCardNo);
1015	1036	} else if (StringUtils.isNotEmpty(id)) {
1016	1037	patientsQuery.setId(id);
1017		- }else if(StringUtils.isNotEmpty(pid)){
	1038	+ } else if (StringUtils.isNotEmpty(pid)) {
1018	1039	patientsQuery.setPid(pid);
1019	1040	}
1020	1041	patientsQuery.setType(type);
...	...	@@ -1088,7 +1109,7 @@
1088	1109	hospital = list1.get(0) + "";
1089	1110	}
1090	1111	//查询产妇数据
1091		- patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1, false,null);
	1112	+ patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1, false, null);
1092	1113	}
1093	1114
1094	1115	if (null == patients) {

...	...	@@ -125,7 +125,6 @@
125	125	referralApplyOrderModel.setServiceType(patients.getServiceType());
126	126	id=patients.getId();
127	127	if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) {
128		-
129	128	PatientsQuery patientsQuery1 = new PatientsQuery();
130	129	patientsQuery1.setPid(patients.getPid());
131	130	patientsQuery1.setYn(YnEnums.YES.getId());
...	...	@@ -143,6 +142,9 @@
143	142	patients.setExpVip(0);
144	143	id=patientsService.addPatient(patients).getId();
145	144	}
	145	+ }else{
	146	+ patients.setBuildType(3);
	147	+ patientsService.updatePatient(patients);
146	148	}
147	149	}
148	150	} else {
...	...	@@ -186,6 +188,9 @@
186	188	babyModel.setBuildType(3);
187	189	id =babyService.addOneBaby(babyModel).getId();
188	190	}
	191	+ }else {
	192	+ babyModel.setBuildType(3);
	193	+ babyService.updateOneBaby(babyModel,babyModel.getId());
189	194	}
190	195	}
191	196	}

...	...	@@ -23,6 +23,7 @@
23	23	import org.springframework.data.domain.Sort;
24	24	import org.springframework.stereotype.Component;
25	25
	26	+import java.time.YearMonth;
26	27	import java.util.*;
27	28
28	29	@Component
...	...	@@ -42,7 +43,7 @@
42	43	private PatientsService patientsService;
43	44
44	45	@Autowired
45		- private AntenatalExaminationService antenatalExaminationService;
	46	+ private ApplyOrderService applyOrderService;
46	47
47	48	@Autowired
48	49	private UsersService usersService;
...	...	@@ -185,7 +186,7 @@
185	186	* @param request
186	187	* @return
187	188	*/
188		- public BaseResponse addBabyCheck(BabyCheckRequest request) {
	189	+ public BaseResponse addBabyCheck(BabyCheckRequest request,Integer userId) {
189	190
190	191	//儿童体检后更新下次预约时间和是否高危在基础数据表里面
191	192	BabyModel bm = new BabyModel();
...	...	@@ -214,6 +215,31 @@
214	215	br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
215	216	br.setErrormsg("失败");
216	217
	218	+ }
	219	+ BabyModelQuery babyModelQuery=new BabyModelQuery();
	220	+ babyModelQuery.setId(request.getBuildId());
	221	+ babyModelQuery.setYn(YnEnums.YES.getId());
	222	+ babyModelQuery.setBuildType(3);
	223	+ List<BabyModel> babyModelList= babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
	224	+ if(CollectionUtils.isNotEmpty(babyModelList)){
	225	+ ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
	226	+ referralApplyOrderQuery.setParentId(request.getBuildId());
	227	+ String hospital =babyModelList.get(0).getHospitalId();
	228	+ referralApplyOrderQuery.setHospitalId(hospital);
	229	+ List<ReferralApplyOrderModel> orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
	230	+ if (CollectionUtils.isNotEmpty(orderModelList)) {
	231	+ String outHospitalId = orderModelList.get(0).getOutHospitalId();
	232	+ ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery();
	233	+ referralApplyOrderQuery1.setOutHospitalId(outHospitalId);
	234	+ referralApplyOrderQuery1.setTransferredHospital(hospital);
	235	+ referralApplyOrderQuery1.setPid(babyModelList.get(0).getPid());
	236	+
	237	+ ReferralApplyOrderModel model1 = new ReferralApplyOrderModel();
	238	+ //设置接收时间
	239	+ model1.setReceived(new Date());
	240	+ model1.setRecDoctor(userId + "");
	241	+ applyOrderService.updateByParentId(referralApplyOrderQuery1, model1);
	242	+ }
217	243	}
218	244	br.setErrorcode(ErrorCodeConstants.SUCCESS);
219	245	br.setErrormsg("成功");