jiangjiazhi / regional-platform

Commit 356e8a73893735cffd7c5d9be73d6927d93d914c

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 54 additions and 37 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/ConnTools.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/hs/HsfyFmService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommonController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java

...	...	@@ -10,7 +10,7 @@
10	10	public class ConnTools {
11	11
12	12	private static String fmDirverClassName="com.microsoft.sqlserver.jdbc.SQLServerDriver";
13		- private static String fmUrl="jdbc:sqlserver://192.168.100.162:1433; DatabaseName=ogis_hsfy";
	13	+ private static String fmUrl="jdbc:sqlserver://172.16.18.162:1433; DatabaseName=ogis_hsfy";
14	14	private static String fmUser="sa";
15	15	private static String fmPassword="net2k";
16	16

...	...	@@ -57,9 +57,8 @@
57	57	@Autowired
58	58	private PatientServiceFacade patientServiceFacade;
59	59
60		- @Autowired
61		- private DzfyHisService dzfyHisService;
62	60
	61	+
63	62	private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
64	63
65	64	private static Map<String, List> babyMap = new HashMap<>();
66	65
67	66
68	67
...	...	@@ -132,25 +131,25 @@
132	131	" DUE_WEEK as DUE_WEEK, " +
133	132	" DUE_DAY as DUE_DAY, " +
134	133	" FETUS_NUM as FETUS_NUM, " +
135		- " BABY_ASPHYXIAM as BABY_ASPHYXIAM, " +
	134	+// " BABY_ASPHYXIAM as BABY_ASPHYXIAM, " +
136	135	" BABY_WEIGHT as BABY_WEIGHT, " +
137	136	" BABY_HEIGHT as BABY_HEIGHT, " +
138		- " BABY_APGAR_SCORE_ONE as BABY_APGAR_SCORE_ONE, " +
139		- " BABY_APGAR_SCORE_FIVE as BABY_APGAR_SCORE_FIVE, " +
140		- " BABY_APGAR_SCORE_TEN as BABY_APGAR_SCORE_TEN, " +
	137	+// " BABY_APGAR_SCORE_ONE as BABY_APGAR_SCORE_ONE, " +
	138	+// " BABY_APGAR_SCORE_FIVE as BABY_APGAR_SCORE_FIVE, " +
	139	+// " BABY_APGAR_SCORE_TEN as BABY_APGAR_SCORE_TEN, " +
141	140	" BABY_PREGNANCY_OUT as BABY_PREGNANCY_OUT, " +
142	141	" DELIVERY_MODE as DELIVERY_MODE, "+
143		- " TMCSIDE as TMCSIDE, " +
144		- " TMCTYPE as TMCTYPE, " +
145		- " MATERNAL_INFO as MATERNAL_INFO, " +
	142	+// " TMCSIDE as TMCSIDE, " +
	143	+// " TMCTYPE as TMCTYPE, " +
	144	+// " MATERNAL_INFO as MATERNAL_INFO, " +
146	145	" PERINEAL_CONDITION as PERINEAL_CONDITION, " +
147		- " SH_LOSE_BLOOD as SH_LOSE_BLOOD, " +
148		- " TH_LOSE_BLOOD as TH_LOSE_BLOOD, " +
149		- " DELIVER_DOCTOR as DELIVER_DOCTOR, " +
150		- " PROD_PROCESS_ONE as PROD_PROCESS_ONE, " +
151		- " PROD_PROCESS_TWO as PROD_PROCESS_TWO," +
152		- " PROD_PROCESS_THREE as PROD_PROCESS_THREE, " +
153		- " TOTAL_PROCESS as TOTAL_PROCESS, " +
	146	+// " SH_LOSE_BLOOD as SH_LOSE_BLOOD, " +
	147	+// " TH_LOSE_BLOOD as TH_LOSE_BLOOD, " +
	148	+// " DELIVER_DOCTOR as DELIVER_DOCTOR, " +
	149	+// " PROD_PROCESS_ONE as PROD_PROCESS_ONE, " +
	150	+// " PROD_PROCESS_TWO as PROD_PROCESS_TWO," +
	151	+// " PROD_PROCESS_THREE as PROD_PROCESS_THREE, " +
	152	+// " TOTAL_PROCESS as TOTAL_PROCESS, " +
154	153	" PLACENTA_NUM as PLACENTA_NUM, " +
155	154	" DELIVER_HOSPITAL as DELIVER_HOSPITAL, " +
156	155	" DELIVER_DOCTOR as DELIVER_DOCTOR ";
...	...	@@ -165,7 +164,7 @@
165	164	" CREATED > CONVERT(DATETIME,'" + start + "', 120) and CREATED <= CONVERT(DATETIME,'" + end + "', 120)" ;
166	165	if (phone != null)
167	166	{
168		- sql+=" and phone = '"+phone+"'";
	167	+ sql+=" and IDCARD = '"+phone+"'";
169	168	}
170	169	ExceptionUtils.catchException("sql====" +sql);
171	170	List<Fm> list = queryRunner.query(conn, sql, new BeanListHandler<Fm>(Fm.class));
...	...	@@ -300,11 +299,11 @@
300	299	deliverAddRequest.setDueWeek(week);
301	300	}
302	301
303		- deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1)
304		- Integer placenta_Num = allFm.getPLACENTA_NUM();
305		- if(placenta_Num!=null){
306		- deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1)
307		- }
	302	+// deliverAddRequest.setTireNumber(allFm.getFETUS_NUM());// 胎数(之前赋值为死值1)
	303	+// Integer placenta_Num = allFm.getPLACENTA_NUM();
	304	+// if(placenta_Num!=null){
	305	+// deliverAddRequest.setPlacenta(allFm.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1)
	306	+// }
308	307	if ("完整".equals(allFm.getPERINEAL_CONDITION()) \|\| "".equals(allFm.getPERINEAL_CONDITION())) {
309	308	deliverAddRequest.setPerinealCondition("full");
310	309	} else if ("切开".equals(allFm.getPERINEAL_CONDITION()) \|\| "侧切".equals(allFm.getPERINEAL_CONDITION())) {
...	...	@@ -387,10 +386,11 @@
387	386
388	387	baby.setDeformity((allFm.getBABY_DEFORMITY()==null?0:1)); //畸形 0非畸形 1畸形
389	388
390		- String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT();
391		- if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){
392		- baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(allFm.getBABY_PREGNANCY_OUT())); // 妊娠结局
393		- }
	389	+ //String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT();
	390	+// if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){
	391	+// baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(allFm.getBABY_PREGNANCY_OUT())); // 妊娠结局
	392	+// }
	393	+ baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局
394	394
395	395	baby.setDueTime(fmt.format(dueDate));//分娩时间
396	396	babies.add(baby);
...	...	@@ -624,15 +624,6 @@
624	624	// request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务
625	625	// request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通
626	626
627		- if (patInfo != null && StringUtils.isNotEmpty(fm.getBHNUM()))
628		- {
629		- Map<String,Object> diags = dzfyHisService.queryHisBabyDiagnosis(fm.getBHNUM());
630		- if (diags != null && diags.size() > 0)
631		- {
632		- request.setBlNo(fm.getBHNUM());
633		- request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
634		- }
635		- }
636	627
637	628	//标准服务开通
638	629	request.setSerInfos(patientServiceFacade.defaultServiceOpen());

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.hospitalapi.hs.HsfyFmService;
3	4	import org.springframework.beans.factory.annotation.Autowired;
4		-import org.springframework.data.repository.query.Param;
5	5	import org.springframework.stereotype.Controller;
6	6	import org.springframework.web.bind.annotation.RequestMapping;
7	7	import org.springframework.web.bind.annotation.RequestMethod;
...	...	@@ -23,6 +23,15 @@
23	23	@Controller
24	24	@RequestMapping("/common")
25	25	public class CommonController extends BaseController {
	26	+ @Autowired
	27	+ private HsfyFmService hsfyFmService;
	28	+
	29	+ @RequestMapping(method = RequestMethod.GET, value = "/hsfy")
	30	+ @ResponseBody
	31	+ public void hsfy(@RequestParam(required = false) String idCard,@RequestParam("start") String start,@RequestParam("end") String end) {
	32	+ hsfyFmService.syncByPhone(start,end,idCard);
	33	+ }
	34	+
26	35
27	36	@Autowired
28	37	private ICommonServer commonServer;

...	...	@@ -182,6 +182,23 @@
182	182	tempMap.put("doctorName", null);
183	183	}
184	184	tempMap.put("phone", p == null ? null : StringUtils.encryPhone(p.getPhone()));
	185	+
	186	+
	187	+ String gcDoctor = "";
	188	+ List<Patients> patientses = mongoTemplate.find(Query.query(Criteria.where("pid").is(model.getPid()).and("yn").is(YnEnums.YES.getId())), Patients.class);
	189	+ if (CollectionUtils.isNotEmpty(patientses))
	190	+ {
	191	+ for (Patients pat : patientses)
	192	+ {
	193	+ if (StringUtils.isNotEmpty(pat.getGcdfDoctorId()))
	194	+ {
	195	+ gcDoctor = pat.getGcdfDoctorId();
	196	+ break;
	197	+ }
	198	+ }
	199	+ }
	200	+ tempMap.put("gcDoctor", gcDoctor);
	201	+
185	202	rest.add(tempMap);
186	203	}
187	204	pageResult.setGrid(rest);