jiangjiazhi / regional-platform

Commit 17ed8827493124becb359228281adc528df1edea

Authored by zhangchao about 1 year ago

Exists in dev

#fix:优化产后康复本院职工科室查询逻辑

Showing 5 changed files with 91 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.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/ChildbirthManagerRequest.java

...	...	@@ -85,7 +85,22 @@
85	85	return br;
86	86	}
87	87
	88	+ @RequestMapping(value = "/wx/findAntExChuData", method = RequestMethod.GET)
	89	+ @ResponseBody
	90	+ public BaseObjectResponse findWxAntExChuData(@RequestParam("id") String id,
	91	+ HttpServletRequest request) {
	92	+ BaseObjectResponse br = viewFacade.findAntExChu(id);
	93	+ return br;
	94	+ }
88	95
	96	+ @RequestMapping(value = "/wx/findCheckDoctor", method = RequestMethod.GET)
	97	+ @ResponseBody
	98	+ public BaseObjectResponse findCheckDoctor(@RequestParam("pid") String pid) {
	99	+ BaseObjectResponse br = viewFacade.findCheckDoctor(pid);
	100	+ return br;
	101	+ }
	102	+
	103	+
89	104	/**
90	105	* 大同打印高危孕妇专案卡
91	106	* @param id
92	107
93	108
...	...	@@ -830,18 +845,27 @@
830	845	* 查询复诊接口
831	846	*
832	847	* @param id
833		- * @param request
834	848	* @return
835	849	*/
836	850	@RequestMapping(value = "/findAntenatalExaminationData", method = RequestMethod.GET)
837	851	@ResponseBody
838	852	@TokenRequired
839		- public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id") String id,
840		- HttpServletRequest request) {
	853	+ public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id") String id) {
841	854
842	855	return viewFacade.findAntenatalExamination(id);
843	856	}
844	857
	858	+ /**
	859	+ * 查询复诊接口
	860	+ *
	861	+ * @param id
	862	+ * @return
	863	+ */
	864	+ @RequestMapping(value = "/wx/findAntenatalExaminationData", method = RequestMethod.GET)
	865	+ @ResponseBody
	866	+ public BaseObjectResponse findWxAntenatalExaminationData(@RequestParam("id") String id) {
	867	+ return viewFacade.findAntenatalExamination(id);
	868	+ }
845	869
846	870	/**
847	871	* 大同打印复诊

...	...	@@ -1221,7 +1221,7 @@
1221	1221	private void sendbuildingMsg(Patients patient, Integer subTypeId, String first, String keyWord1, String remark) {
1222	1222	if ("1000000016".equals(patient.getHospitalId())) {
1223	1223	try {
1224		- Thread.sleep(5000);
	1224	+ // Thread.sleep(5000);
1225	1225	logger.info("sendbuildingMsg startup");
1226	1226	List<MsgRequest> messages = new ArrayList<>();
1227	1227	MsgRequest mr = new MsgRequest();
...	...	@@ -1256,7 +1256,7 @@
1256	1256	mr.setWxTempId(WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId());
1257	1257	messages.add(mr);
1258	1258	smsConfigFacade.saveMsg(messages, patient.getHospitalId());
1259		- } catch (InterruptedException e) {
	1259	+ } catch (Exception e) {
1260	1260	logger.error("sendbuildingMsg Exception " + e);
1261	1261	}
1262	1262

...	...	@@ -607,7 +607,7 @@
607	607	public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1, Integer objType, Integer type) {
608	608	if ("2100002419".equals(patient.getHospitalId())) {
609	609	try {
610		- Thread.sleep(3000);
	610	+ // Thread.sleep(3000);
611	611	logger.info("sendServiceMsg startup");
612	612	List<MsgRequest> messages = new ArrayList<>();
613	613	if (type != null) {

...	...	@@ -1679,6 +1679,61 @@
1679	1679	return bgHighRisk;
1680	1680	}
1681	1681
	1682	+
	1683	+ public BaseObjectResponse findCheckDoctor(String pid){
	1684	+ BaseObjectResponse br = new BaseObjectResponse();
	1685	+
	1686	+ if (org.apache.commons.lang.StringUtils.isEmpty(pid)) {
	1687	+ br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	1688	+ br.setErrormsg("id为空");
	1689	+ return br;
	1690	+ }
	1691	+
	1692	+ Patients patients = patientsService.findOnePatientById(pid);
	1693	+ if (patients == null \|\| patients.getYn() == YnEnums.NO.getId()) {
	1694	+ br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	1695	+ br.setErrormsg("孕妇信息不存在");
	1696	+ return br;
	1697	+ }
	1698	+
	1699	+ List<Map> doctorList=new ArrayList<>();
	1700	+ AntExChuQuery antExChuQuery=new AntExChuQuery();
	1701	+ antExChuQuery.setYn(1);
	1702	+ antExChuQuery.setParentId(patients.getId());
	1703	+ List<AntExChuModel> antExRecordModelList= antExService.queryAntExChu(antExChuQuery);
	1704	+ if (CollectionUtils.isNotEmpty(antExRecordModelList)){
	1705	+ AntExChuModel antExChuModel= antExRecordModelList.get(0);
	1706	+ if (StringUtils.isNotEmpty(antExChuModel.getProdDoctor())){
	1707	+ Users users = usersService.getUsers(Integer.parseInt(antExChuModel.getProdDoctor()));
	1708	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1709	+ Map<String,String> params=new HashMap<>();
	1710	+ params.put("checkDoctor",users.getName());
	1711	+ doctorList.add(params);
	1712	+ }
	1713	+ }
	1714	+ AntExQuery antExQuery = new AntExQuery();
	1715	+ antExQuery.setParentId(patients.getId());
	1716	+ antExQuery.setYn(1);
	1717	+ List<AntenatalExaminationModel> antenatalExaminationModels = antenatalExaminationService.queryLastAntenx(antExQuery);
	1718	+ if (CollectionUtils.isNotEmpty(antenatalExaminationModels)){
	1719	+ for (AntenatalExaminationModel antenatalExaminationModel:antenatalExaminationModels){
	1720	+ if (StringUtils.isNotEmpty(antenatalExaminationModel.getCheckDoctor())){
	1721	+ Users users = usersService.getUsers(Integer.parseInt(antenatalExaminationModel.getCheckDoctor()));
	1722	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1723	+ Map<String,String> params=new HashMap<>();
	1724	+ params.put("checkDoctor",users.getName());
	1725	+ doctorList.add(params);
	1726	+ }
	1727	+ }
	1728	+ }
	1729	+ }
	1730	+ }
	1731	+ br.setErrorcode(ErrorCodeConstants.SUCCESS);
	1732	+ br.setErrormsg("成功");
	1733	+ br.setData(doctorList);
	1734	+ return br;
	1735	+ }
	1736	+
1682	1737	/**
1683	1738	* 初诊查询
1684	1739	*

...	...	@@ -746,12 +746,12 @@
746	746	initQueryMap.put("ygbmky", "乙肝检测结果");
747	747	initQueryMap.put("createdWeek", "建档孕周");
748	748	initQueryMap.put("coupon", "优惠券发放");
	749	+ initQueryMap.put("dept", "");
749	750
750	751
751	752
752	753
753	754
754		-
755	755	initQueryMap.put("maternalDeliverId", "");
756	756	initQueryMap.put("patientId", "");
757	757	initQueryMap.put("pid", "");
758	758
...	...	@@ -783,9 +783,9 @@
783	783	// initQueryMapCd.put("apgarScorePf10", "Apgar10分钟");
784	784	initQueryMapCd.put("gcStatus", "产后观察");
785	785	initQueryMapCd.put("recordsNum", "记录条数");
	786	+ initQueryMapCd.put("dept", "");
786	787
787	788
788		-
789	789	//衡水导出
790	790	Map<String, String> initQueryMapHs = new LinkedHashMap<>();
791	791	initQueryMapHs.put("vcCardNo", "卡号");
792	792
...	...	@@ -845,8 +845,8 @@
845	845	initQueryMapHs.put("deathCause", "原因");
846	846	initQueryMapHs.put("babyHealthy", "新生儿疾病");
847	847	initQueryMapHs.put("malformation", "畸形");
	848	+ initQueryMapHs.put("dept", "");
848	849
849		-
850	850	Map<String, String> normalQueryMap = new LinkedHashMap<>();
851	851	normalQueryMap.put("apgarScorePf1", "Apgar1分钟");
852	852	normalQueryMap.put("apgarScorePf5", "Apgar5分钟");
...	...	@@ -871,6 +871,7 @@
871	871	normalQueryMap.put("phone", "联系方式");
872	872	normalQueryMap.put("patientId", "");
873	873	normalQueryMap.put("pid", "");
	874	+ normalQueryMap.put("dept", "");
874	875	normalQueryMap.put("rhloseBloodL", "产后24小时内失血量");
875	876	Map<String, String> areaQueryMap = new LinkedHashMap<>();
876	877	areaQueryMap.put("apgarScorePf1", "Apgar1分钟");
...	...	@@ -903,7 +904,7 @@
903	904	areaQueryMap.put("ygbmky", "乙肝检测结果");
904	905	areaQueryMap.put("createdWeek", "建档孕周");
905	906	areaQueryMap.put("coupon", "优惠券发放");
906		-
	907	+ areaQueryMap.put("dept", "");
907	908	Map<String, String> initQueryMapqhdky = new LinkedHashMap<>();
908	909
909	910	initQueryMapqhdky.put("name", "姓名");
...	...	@@ -948,7 +949,7 @@
948	949	initQueryMapqhdky.put("babyWeight", "新生儿体重");
949	950	initQueryMapqhdky.put("xsext", "新生儿血糖");
950	951	initQueryMapqhdky.put("apgarScore", "新生儿评分");
951		-
	952	+ initQueryMapqhdky.put("dept", "");
952	953
953	954	this.initQueryMapqhdky = initQueryMapqhdky;
954	955	this.initQueryMap = initQueryMap;