jiangjiazhi / regional-platform

Commit 0446d4c3cebf484eebdbe0b6881363cc8752e8bc

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

南和分娩

Showing 2 changed files with 17 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/nanhe/NhfyFmService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FmController.java

...	...	@@ -313,10 +313,10 @@
313	313	List<MatDeliverAddRequest.Baby> babies = new ArrayList<>();
314	314	MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest();
315	315	for(Fm allFm:allList){
316		- System.out.println(allFm.toString());
317	316	a=0;
318	317	count=0;
319		- if (!"活产".equals(allFm.getBABY_PREGNANCY_OUT()))
	318	+ System.out.println("0-------------"+allFm.getBABY_PREGNANCY_OUT());
	319	+ if (!"1".equals(allFm.getBABY_PREGNANCY_OUT()))
320	320	{
321	321	continue;
322	322	}
323	323
...	...	@@ -330,10 +330,13 @@
330	330	query.setType(1); //孕妇
331	331	query.setDueStatus(0); //未终止妊娠
332	332	String[] strs = new String[]{allFm.getPHONE(),allFm.getIDCARD()};
	333	+ System.out.println("1----------"+strs);
333	334	query.setPc(strs);
334	335
335	336	//查询该孕妇是否在孕产婴系统中建档
336	337	List<Patients> patientses = patientsService.queryPatient(query);
	338	+ System.out.println("2----------"+patientses.size());
	339	+
337	340	Patients patient = new Patients();
338	341	if(CollectionUtils.isNotEmpty(patientses)){
339	342	ExceptionUtils.catchException("patientses"+patientses);
340	343
...	...	@@ -341,8 +344,9 @@
341	344	UsersQuery usersQuery = new UsersQuery();
342	345	usersQuery.setYn(YnEnums.YES.getId());
343	346	usersQuery.setOrgId(new Integer(Integer.parseInt(HOSPITALID)));
344		- usersQuery.setName("产房");
	347	+ usersQuery.setName("产科");
345	348	users = usersService.queryUsers(usersQuery);
	349	+ System.out.println("3----------"+users.size());
346	350
347	351	if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) {
348	352
...	...	@@ -389,6 +393,8 @@
389	393
390	394	deliverAddRequest.setProdprocess(map);
391	395	deliverAddRequest.setTotalprocess(totalMap);
	396	+ System.out.println("4----------"+allFm.getDELIVER_DOCTOR());
	397	+
392	398	deliverAddRequest.setDeliverDoctor(allFm.getDELIVER_DOCTOR());
393	399	deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate));
394	400	deliverAddRequest.setParentId(patient.getId());
395	401
...	...	@@ -493,10 +499,13 @@
493	499
494	500	baby.setDeformity((allFm.getBABY_DEFORMITY()==null?0:1)); //畸形 0非畸形 1畸形
495	501
496		- String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT();
	502	+ /* String baby_Pregnancy_Out = allFm.getBABY_PREGNANCY_OUT()=="1"?"活产":"";
497	503	if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){
498		- baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(allFm.getBABY_PREGNANCY_OUT())); // 妊娠结局
499		- }
	504	+ baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局
	505	+ }*/
	506	+
	507	+ System.out.println("5-------------"+allFm.getBABY_PREGNANCY_OUT()=="1"?"活产":"");
	508	+ baby.setPregnancyOut(RenShenJieJuEnums.getIdByName("活产")); // 妊娠结局
500	509
501	510	baby.setDueTime(fmt.format(dueDate));//分娩时间
502	511	babies.add(baby);

...	...	@@ -12,6 +12,7 @@
12	12	import org.springframework.web.bind.annotation.ResponseBody;
13	13
14	14	import javax.servlet.http.HttpServletRequest;
	15	+import javax.validation.Valid;
15	16	import java.util.List;
16	17
17	18	/**
...	...	@@ -28,8 +29,7 @@
28	29
29	30	@RequestMapping(method = RequestMethod.POST, value = "/saveFmData")
30	31	@ResponseBody
31		- public String saveFmData(@RequestBody List<Fm> models,
32		- HttpServletRequest httpServletRequest){
	32	+ public String saveFmData(@Valid @RequestBody List<Fm> models, HttpServletRequest httpServletRequest){
33	33
34	34	if("17".equals(models.get(0).getVision())){
35	35	lpfyFmService.queryFmPatient(models);