jiangjiazhi / regional-platform

Commit 34dc0927cbe403d4309e2bf7328878cc9a5242b9

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 237 additions and 133 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.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/ViewFacade.java

...	...	@@ -89,6 +89,10 @@
89	89
90	90
91	91	@Autowired
	92	+ private BabyService babyService;
	93	+
	94	+
	95	+ @Autowired
92	96	private TrackDownRecordService trackDownRecordService;
93	97
94	98
...	...	@@ -1330,13 +1334,6 @@
1330	1334	// }
1331	1335
1332	1336
1333		-
1334		-
1335		-
1336		-
1337		-
1338		-
1339		-
1340	1337	@Autowired
1341	1338	private BabyDiagnoseService babyDiagnoseService;
1342	1339
...	...	@@ -1386,15 +1383,6 @@
1386	1383	}
1387	1384
1388	1385
1389		-
1390		-
1391		-
1392		-
1393		-
1394		-
1395		-
1396		-
1397		-
1398	1386	/**
1399	1387	* 修正儿童助产机构
1400	1388	*
1401	1389
1402	1390
1403	1391
1404	1392
...	...	@@ -3216,30 +3204,24 @@
3216	3204
3217	3205	@RequestMapping(method = RequestMethod.GET, value = "/cdMatDeliverHandle")
3218	3206	@ResponseBody
3219		- public void cdMatDeliverHandle(String start,String end)
3220		- {
	3207	+ public void cdMatDeliverHandle(String start, String end) {
3221	3208	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
3222	3209	matDeliverQuery.setCreatedTimeStart(DateUtil.parseYMD(start));
3223	3210	matDeliverQuery.setCreatedTimeEnd(DateUtil.parseYMD(end));
3224	3211	matDeliverQuery.setYn(YnEnums.YES.getId());
3225	3212	List<MaternalDeliverModel> deliverModels = matDeliverService.query(matDeliverQuery);
3226		- if (CollectionUtils.isNotEmpty(deliverModels))
3227		- {
3228		- for (MaternalDeliverModel deliverModel : deliverModels)
3229		- {
	3213	+ if (CollectionUtils.isNotEmpty(deliverModels)) {
	3214	+ for (MaternalDeliverModel deliverModel : deliverModels) {
3230	3215	try {
3231	3216	Patients pat = patientsService.findOnePatientById(deliverModel.getParentId());
3232		- if (pat != null && !StringUtils.isNotEmpty(pat.getFmHospital()))
3233		- {
	3217	+ if (pat != null && !StringUtils.isNotEmpty(pat.getFmHospital())) {
3234	3218
3235	3219	Organization org = organizationService.getOrganization(Integer.parseInt(pat.getHospitalId()));
3236		- if ("9".equals(org.getCityId()))
3237		- {
3238		- System.out.println(pat.getUsername() + " " +pat.getCardNo()+ " " + pat.getPhone()+" "+org.getName()+"\r\n" );
	3220	+ if ("9".equals(org.getCityId())) {
	3221	+ System.out.println(pat.getUsername() + " " + pat.getCardNo() + " " + pat.getPhone() + " " + org.getName() + "\r\n");
3239	3222	}
3240	3223	}
3241		- }catch (Exception e)
3242		- {
	3224	+ } catch (Exception e) {
3243	3225	continue;
3244	3226	}
3245	3227	}
3246	3228
3247	3229
...	...	@@ -3258,18 +3240,14 @@
3258	3240	patientQuery.setNeed("y");
3259	3241	patientQuery.setPerType(1);
3260	3242	patientQuery.setLimit(1000);
3261		- while (true)
3262		- {
	3243	+ while (true) {
3263	3244	System.out.println("page index " + page);
3264	3245	patientQuery.setPage(page);
3265	3246	List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
3266		- if (CollectionUtils.isEmpty(patientServices))
3267		- {
	3247	+ if (CollectionUtils.isEmpty(patientServices)) {
3268	3248	System.out.println("service break ............ ");
3269	3249	break;
3270		- }
3271		- else
3272		- {
	3250	+ } else {
3273	3251	int batchSize = 200;
3274	3252	int end = 0;
3275	3253	for (int i = 0; i < patientServices.size(); i += batchSize) {
3276	3254
3277	3255
3278	3256
3279	3257
...	...	@@ -3282,27 +3260,23 @@
3282	3260	commonThreadPool.execute(new Runnable() {
3283	3261	@Override
3284	3262	public void run() {
3285		- for (PatientService patientService : serviceRecords)
3286		- {
3287		- if (patientService.getSerStatus() != null && patientService.getSerStatus() == 1 && patientService.getServiceWeek() == null && patientService.getParentid() != null)
3288		- {
	3263	+ for (PatientService patientService : serviceRecords) {
	3264	+ if (patientService.getSerStatus() != null && patientService.getSerStatus() == 1 && patientService.getServiceWeek() == null && patientService.getParentid() != null) {
3289	3265	System.out.println("service record id " + patientService.getId());
3290	3266
3291	3267	Patients patients = patientsService.findOnePatientById(patientService.getParentid());
3292		- if (patients != null && patients.getLastMenses() != null)
3293		- {
	3268	+ if (patients != null && patients.getLastMenses() != null) {
3294	3269	patientService.setSerStartTime(patients.getLastMenses());
3295		- patientService.setSerEndTime(DateUtil.addWeek(patients.getLastMenses(),42));
	3270	+ patientService.setSerEndTime(DateUtil.addWeek(patients.getLastMenses(), 42));
3296	3271	patientService.setSerStartWeek(0);
3297	3272	patientService.setSerEndWeek(42);
3298	3273	patientService.setServiceWeek(42);
3299		- if (StringUtils.isNotEmpty(patientService.getSerDoct()))
3300		- {
	3274	+ if (StringUtils.isNotEmpty(patientService.getSerDoct())) {
3301	3275	patientService.setDoctorWeek(42);
3302	3276	patientService.setDocStartWeek(0);
3303	3277	patientService.setDocEndWeek(42);
3304	3278
3305		- patientService.setDocEndTime(DateUtil.addWeek(patients.getLastMenses(),42));
	3279	+ patientService.setDocEndTime(DateUtil.addWeek(patients.getLastMenses(), 42));
3306	3280	patientService.setDocStartTime(patients.getLastMenses());
3307	3281	}
3308	3282	System.out.println("update service id " + patientService.getId());
3309	3283
3310	3284
...	...	@@ -3321,14 +3295,12 @@
3321	3295	}
3322	3296
3323	3297
3324		-
3325	3298	@RequestMapping(value = "/cd/getGw", method = RequestMethod.GET)
3326	3299	@ResponseBody
3327		- public Map getGkyyIdByIdCard(@RequestParam(required = true) String patientId)
3328		- {
	3300	+ public Map getGkyyIdByIdCard(@RequestParam(required = true) String patientId) {
3329	3301	Patients patients = patientsService.findOnePatientById(patientId);
3330	3302	cdGwInterface.getPersonId(patients);
3331		- Map<String,String> map = new HashMap<>();
	3303	+ Map<String, String> map = new HashMap<>();
3332	3304	map.put("id,", "2134123412431");
3333	3305	return map;
3334	3306	}
3335	3307
3336	3308
3337	3309
...	...	@@ -3336,23 +3308,21 @@
3336	3308
3337	3309	@RequestMapping(value = "/setOrgAreaUrlConfig", method = RequestMethod.GET)
3338	3310	@ResponseBody
3339		- public String setOrgAreaUrlConfig(@RequestParam(required = true) String cityId)
3340		- {
3341		- Map<String,String> urlMap = new HashMap<>();
	3311	+ public String setOrgAreaUrlConfig(@RequestParam(required = true) String cityId) {
	3312	+ Map<String, String> urlMap = new HashMap<>();
3342	3313	urlMap.put("2", "https://area-qhd-api.healthbaby.com.cn:18019");//,"秦皇岛"
3343		- urlMap.put("5113aa","https://area-nc-api.healthbaby.com.cn:12356");//,"南充"
3344		- urlMap.put("9","https://area-chengde-api.healthbaby.com.cn:12356");//,"承德"
	3314	+ urlMap.put("5113aa", "https://area-nc-api.healthbaby.com.cn:12356");//,"南充"
	3315	+ urlMap.put("9", "https://area-chengde-api.healthbaby.com.cn:12356");//,"承德"
3345	3316	urlMap.put("4", "https://rp-api.healthbaby.com.cn");//,"线上"
3346	3317	OrganizationQuery query = new OrganizationQuery();
3347	3318	query.setCityId(cityId);
3348	3319	List<Organization> orgs = organizationService.queryOrganization(query);
3349	3320	List<Map> list = new ArrayList<>();
3350		- for (Organization organization : orgs)
3351		- {
	3321	+ for (Organization organization : orgs) {
3352	3322	Map config = new HashMap();
3353		- config.put("hospitalId",organization.getId());
3354		- config.put("domain",urlMap.get(cityId));
3355		- config.put("yn",1);
	3323	+ config.put("hospitalId", organization.getId());
	3324	+ config.put("domain", urlMap.get(cityId));
	3325	+ config.put("yn", 1);
3356	3326	config.put("title", organization.getName());
3357	3327	list.add(config);
3358	3328	}
3359	3329
3360	3330
3361	3331
...	...	@@ -3361,36 +3331,32 @@
3361	3331	}
3362	3332
3363	3333
3364		-
3365		-
3366		-
3367	3334	/**
3368	3335	* 返回秦皇岛就诊卡的密码
3369	3336	* 根据传入的卡的id来计算解密卡号的密码
	3337	+ *
3370	3338	* @param kid
3371	3339	* @return
3372		-
	3340	+ * @RequestMapping(value = "/qhd/getVcCardNoPwd", method = RequestMethod.GET)
	3341	+ * @ResponseBody public String getVcCardNoPwd(@RequestParam(required = true) String kid)
	3342	+ * {
	3343	+ * System.out.println("kid=" + kid);
	3344	+ * String pwd = QhdvcCardNoUtils.getKey(kid);
	3345	+ * try {
	3346	+ * String result = new String(pwd.getBytes("utf-8"),"iso8859-1");
	3347	+ * System.out.println("pwd=" + result);
	3348	+ * return result;
	3349	+ * } catch (UnsupportedEncodingException e) {
	3350	+ * e.printStackTrace();
	3351	+ * }
	3352	+ * return "";
	3353	+ * }
	3354	+ */
3373	3355	@RequestMapping(value = "/qhd/getVcCardNoPwd", method = RequestMethod.GET)
3374	3356	@ResponseBody
3375		- public String getVcCardNoPwd(@RequestParam(required = true) String kid)
3376		- {
3377		- System.out.println("kid=" + kid);
3378		- String pwd = QhdvcCardNoUtils.getKey(kid);
3379		- try {
3380		- String result = new String(pwd.getBytes("utf-8"),"iso8859-1");
3381		- System.out.println("pwd=" + result);
3382		- return result;
3383		- } catch (UnsupportedEncodingException e) {
3384		- e.printStackTrace();
3385		- }
3386		- return "";
3387		- }*/
3388		- @RequestMapping(value = "/qhd/getVcCardNoPwd", method = RequestMethod.GET)
3389		- @ResponseBody
3390		- public String getVcCardNoPwd(@RequestParam(required = true) String kid)
3391		- {
3392		- Map<String,String> map = new HashMap<String, String>();
3393		- map.put("kid",kid);
	3357	+ public String getVcCardNoPwd(@RequestParam(required = true) String kid) {
	3358	+ Map<String, String> map = new HashMap<String, String>();
	3359	+ map.put("kid", kid);
3394	3360	String s = HttpClientUtil.doGet("http://localhost:9090/qhd/getVcCardNoPwd", map, "utf-8", null);
3395	3361	return s;
3396	3362	}
...	...	@@ -3401,8 +3367,7 @@
3401	3367	public String setNumberCode(@RequestParam(required = false) String hid) {
3402	3368	PatientsQuery patientQuery = new PatientsQuery();
3403	3369	patientQuery.setYn(YnEnums.YES.getId());
3404		- if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hid))
3405		- {
	3370	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hid)) {
3406	3371	patientQuery.setHospitalId(hid);
3407	3372	}
3408	3373
3409	3374
...	...	@@ -3424,12 +3389,9 @@
3424	3389	if (CollectionUtils.isNotEmpty(tempList)) {
3425	3390	for (Patients pat : tempList) {
3426	3391	if (pat != null) {
3427		- if (pat.getCardNo().length() > 8)
3428		- {
	3392	+ if (pat.getCardNo().length() > 8) {
3429	3393	pat.setNumberCode(pat.getCardNo().substring(pat.getCardNo().length() - 8));
3430		- }
3431		- else
3432		- {
	3394	+ } else {
3433	3395	pat.setNumberCode(pat.getCardNo());
3434	3396	}
3435	3397	patientsService.updatePatient(pat);
...	...	@@ -3445,6 +3407,7 @@
3445	3407
3446	3408	/**
3447	3409	* 修改最后一次产检预约日期同步到追访记录中
	3410	+ *
3448	3411	* @return
3449	3412	*/
3450	3413	@RequestMapping(value = "/syncTrckDownNextTime", method = RequestMethod.GET)
...	...	@@ -3470,8 +3433,7 @@
3470	3433	for (TrackDownRecord down : tempList) {
3471	3434
3472	3435	Patients pat = patientsService.findOnePatientById(down.getParentId());
3473		- if (pat != null)
3474		- {
	3436	+ if (pat != null) {
3475	3437	trackDownRecordService.updateTrackDownOneCol(down.getId(), pat.getNextCheckTime());
3476	3438	}
3477	3439	}
3478	3440
...	...	@@ -3523,10 +3485,9 @@
3523	3485	}
3524	3486
3525	3487
3526		-
3527	3488	@ResponseBody
3528	3489	@RequestMapping(value = "/updateHsFmPatients", method = RequestMethod.GET)
3529		- public String syncPatientsFmInfo(@RequestParam(required = false) String hospitalId,String startDate,String endDate) {
	3490	+ public String syncPatientsFmInfo(@RequestParam(required = false) String hospitalId, String startDate, String endDate) {
3530	3491	final MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
3531	3492	matDeliverQuery.setYn(YnEnums.YES.getId());
3532	3493	matDeliverQuery.setCreatedStart(DateUtil.parseYMD(startDate));
...	...	@@ -3553,8 +3514,7 @@
3553	3514	Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
3554	3515	if (patients != null && StringUtils.isNotEmpty(maternalDeliverModel.getFmHospital())
3555	3516	&& StringUtils.isNotEmpty(patients.getHospitalId())) {
3556		- if (!maternalDeliverModel.getFmHospital().equals(patients.getHospitalId()))
3557		- {
	3517	+ if (!maternalDeliverModel.getFmHospital().equals(patients.getHospitalId())) {
3558	3518	String source = patients.getId();
3559	3519	patients.setId(null);
3560	3520	patients.setEnable("2");
3561	3521
3562	3522
...	...	@@ -3562,21 +3522,19 @@
3562	3522	patients.setFmHospital(maternalDeliverModel.getFmHospital());
3563	3523	patients.setSource(source);
3564	3524
3565		- if(StringUtils.isEmpty(patients.getBookbuildingDoctor()))
3566		- {
	3525	+ if (StringUtils.isEmpty(patients.getBookbuildingDoctor())) {
3567	3526	UsersQuery usersQuery = new UsersQuery();
3568	3527	usersQuery.setOrgId(Integer.valueOf(maternalDeliverModel.getFmHospital()));
3569		- List<Users> users = usersService.queryUsers(usersQuery);
3570		- if (CollectionUtils.isNotEmpty(users))
3571		- {
3572		- patients.setBookbuildingDoctor(users.get(0).getId()+"");
	3528	+ List<Users> users = usersService.queryUsers(usersQuery);
	3529	+ if (CollectionUtils.isNotEmpty(users)) {
	3530	+ patients.setBookbuildingDoctor(users.get(0).getId() + "");
3573	3531	}
3574	3532	}
3575	3533
3576	3534	patients = patientsService.addPatient(patients);
3577	3535	System.out.println(patients.getId());
3578	3536	maternalDeliverModel.setParentId(patients.getId());
3579		- matDeliverService.updateOne(maternalDeliverModel,maternalDeliverModel.getId());
	3537	+ matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
3580	3538	}
3581	3539	}
3582	3540	}
3583	3541
...	...	@@ -3588,11 +3546,9 @@
3588	3546	}
3589	3547
3590	3548
3591		-
3592		-
3593	3549	@ResponseBody
3594	3550	@RequestMapping(value = "/updatePatientBuildDoctor", method = RequestMethod.GET)
3595		- public String updatePatientBuildDoctor(@RequestParam(required = false) String hospitalId,String startDate,String endDate) {
	3551	+ public String updatePatientBuildDoctor(@RequestParam(required = false) String hospitalId, String startDate, String endDate) {
3596	3552	PatientsQuery patientQuery = new PatientsQuery();
3597	3553	patientQuery.setCreatedTimeStart(DateUtil.parseYMD(startDate));
3598	3554	patientQuery.setCreatedTimeEnd(DateUtil.parseYMD(endDate));
3599	3555
...	...	@@ -3615,13 +3571,11 @@
3615	3571	public void run() {
3616	3572	if (CollectionUtils.isNotEmpty(tempList)) {
3617	3573	for (Patients patients : tempList) {
3618		- if(StringUtils.isEmpty(patients.getBookbuildingDoctor()))
3619		- {
	3574	+ if (StringUtils.isEmpty(patients.getBookbuildingDoctor())) {
3620	3575	UsersQuery usersQuery = new UsersQuery();
3621	3576	usersQuery.setOrgId(Integer.valueOf(patients.getHospitalId()));
3622		- List<Users> users = usersService.queryUsers(usersQuery);
3623		- if (CollectionUtils.isNotEmpty(users))
3624		- {
	3577	+ List<Users> users = usersService.queryUsers(usersQuery);
	3578	+ if (CollectionUtils.isNotEmpty(users)) {
3625	3579	patients.setBookbuildingDoctor(users.get(0).getId() + "");
3626	3580	patientsService.updatePatient(patients);
3627	3581	System.out.println(patients.getId());
3628	3582
...	...	@@ -3636,12 +3590,9 @@
3636	3590	}
3637	3591
3638	3592
3639		-
3640		-
3641		-
3642	3593	@ResponseBody
3643	3594	@RequestMapping(value = "/updateHsFmHospital", method = RequestMethod.GET)
3644		- public String updateHsFmHospital(@RequestParam(required = false) String hospitalId,String startDate,String endDate) {
	3595	+ public String updateHsFmHospital(@RequestParam(required = false) String hospitalId, String startDate, String endDate) {
3645	3596	final MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
3646	3597	matDeliverQuery.setYn(YnEnums.YES.getId());
3647	3598	matDeliverQuery.setCreatedStart(DateUtil.parseYMD(startDate));
...	...	@@ -3682,12 +3633,10 @@
3682	3633	patientsQuery1.setLastMensesStart(DateUtil.addDay(new Date(), -280));
3683	3634	patientsQuery1.setPid(maternalDeliverModel.getPid());
3684	3635	List<Patients> list = patientsService.queryPatient(patientsQuery1);
3685		- if (CollectionUtils.isNotEmpty(list))
3686		- {
3687		- Patients pat = list.get(0);
3688		- if (!maternalDeliverModel.getParentId().equals(pat.getId()))
3689		- {
3690		- System.out.println("分娩数据修改parentid" );
	3636	+ if (CollectionUtils.isNotEmpty(list)) {
	3637	+ Patients pat = list.get(0);
	3638	+ if (!maternalDeliverModel.getParentId().equals(pat.getId())) {
	3639	+ System.out.println("分娩数据修改parentid");
3691	3640	maternalDeliverModel.setParentId(pat.getId());
3692	3641	matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
3693	3642	}
3694	3643
...	...	@@ -3703,10 +3652,9 @@
3703	3652	}
3704	3653
3705	3654
3706		-
3707	3655	@ResponseBody
3708	3656	@RequestMapping(value = "/setPatientLastMenses", method = RequestMethod.GET)
3709		- public BaseObjectResponse setPatientLastMenses(String cardNo,String lastMenses) {
	3657	+ public BaseObjectResponse setPatientLastMenses(String cardNo, String lastMenses) {
3710	3658	BaseObjectResponse objectResponse = new BaseObjectResponse();
3711	3659
3712	3660	PatientsQuery patientsQuery1 = new PatientsQuery();
3713	3661
3714	3662
...	...	@@ -3714,17 +3662,13 @@
3714	3662	patientsQuery1.setYn(YnEnums.YES.getId());
3715	3663	patientsQuery1.setSort("created");
3716	3664	List<Patients> list = patientsService.queryPatient(patientsQuery1);
3717		- if (CollectionUtils.isNotEmpty(list))
3718		- {
3719		- for (Patients pat : list)
3720		- {
	3665	+ if (CollectionUtils.isNotEmpty(list)) {
	3666	+ for (Patients pat : list) {
3721	3667	PersonModel persons = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class);
3722		- if (persons != null)
3723		- {
	3668	+ if (persons != null) {
3724	3669	persons.setType(1);
3725	3670	personService.updatePerson(persons, persons.getId());
3726		- if ("0001-01-01".equals(DateUtil.getyyyy_MM_dd(pat.getLastMenses())))
3727		- {
	3671	+ if ("0001-01-01".equals(DateUtil.getyyyy_MM_dd(pat.getLastMenses()))) {
3728	3672	Date lastMensesDate = DateUtil.parseYMD(lastMenses);
3729	3673	pat.setLastMenses(lastMensesDate);
3730	3674	pat.setDueDate(DateUtil.addDay(lastMensesDate, 280));
...	...	@@ -3741,6 +3685,42 @@
3741	3685	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
3742	3686	objectResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
3743	3687	return new BaseObjectResponse();
	3688	+ }
	3689	+
	3690	+
	3691	+ /**
	3692	+ *
	3693	+ */
	3694	+ @ResponseBody
	3695	+ @RequestMapping(value = "/setBabyHospitalId", method = RequestMethod.GET)
	3696	+ public void setBabyHospitalId()
	3697	+ {
	3698	+ BabyModelQuery babyModelQuery = new BabyModelQuery();
	3699	+ babyModelQuery.setDataStatus(true);
	3700	+ babyModelQuery.setBuildType(2);
	3701	+ babyModelQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -3));
	3702	+ babyModelQuery.setCreatedTimeEnd(new Date());
	3703	+ List<BabyModel> list = babyService.queryBabyWithQuery(babyModelQuery);
	3704	+ if (CollectionUtils.isNotEmpty(list))
	3705	+ {
	3706	+ System.out.println("========="+list.size());
	3707	+ for (BabyModel baby : list)
	3708	+ {
	3709	+ MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
	3710	+ matDeliverQuery.setYn(YnEnums.YES.getId());
	3711	+ matDeliverQuery.setParentId(baby.getParentId());
	3712	+ List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
	3713	+ if (CollectionUtils.isNotEmpty(maternalDeliverModelList))
	3714	+ {
	3715	+ if (!baby.getHospitalId().equals(maternalDeliverModelList.get(0).getFmHospital()))
	3716	+ {
	3717	+ System.out.println("========="+baby.getId());
	3718	+ baby.setHospitalId(maternalDeliverModelList.get(0).getFmHospital());
	3719	+ babyService.updateOneBaby(baby,baby.getId());
	3720	+ }
	3721	+ }
	3722	+ }
	3723	+ }
3744	3724	}
3745	3725
3746	3726

...	...	@@ -1241,8 +1241,132 @@
1241	1241	if (isSync) {
1242	1242	syncDataToV2(patients, id, userId);
1243	1243	}
	1244	+// final Patients updatePatient = patient;
1244	1245
	1246	+// commonThreadPool.execute(new Runnable() {
	1247	+// @Override
	1248	+// public void run() {
	1249	+// updateCurrentAllPatientInfo(updatePatient);
	1250	+// }
	1251	+// });
	1252	+
1245	1253	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	1254	+ }
	1255	+
	1256	+
	1257	+ /**
	1258	+ * 更新当前产程所有的档案的信息
	1259	+ */
	1260	+ private void updateCurrentAllPatientInfo(Patients patient)
	1261	+ {
	1262	+ PatientsQuery patientsQuery = new PatientsQuery();
	1263	+ patientsQuery.setYn(YnEnums.YES.getId());
	1264	+ patientsQuery.setPid(patient.getPid());
	1265	+ patientsQuery.setLastMensesStart(patient.getLastMenses());
	1266	+ List<Patients> localPatients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
	1267	+ if (CollectionUtils.isNotEmpty(localPatients))
	1268	+ {
	1269	+ for (Patients pat : localPatients)
	1270	+ {
	1271	+ if (!pat.getId().equals(patient.getId()))
	1272	+ {
	1273	+ getPatientsData(pat,patient);
	1274	+ yunBookbuildingService.updatePregnant(pat, pat.getId());
	1275	+ }
	1276	+ }
	1277	+ }
	1278	+ }
	1279	+
	1280	+
	1281	+ public void getPatientsData(Patients patient,Patients updatePatient) {
	1282	+ patient.setChildExtAddrs(updatePatient.getChildExtAddrs());
	1283	+ patient.setReqHusband(updatePatient.getReqHusband());
	1284	+ patient.setFuckLastMens(updatePatient.getFuckLastMens());
	1285	+ patient.setLastMenses(updatePatient.getLastMenses());
	1286	+
	1287	+ patient.setLastMenstrualPeriodBasis(updatePatient.getLastMenstrualPeriodBasis());
	1288	+ patient.setLastMenstrualPeriodBasisDoctorId(updatePatient.getLastMenstrualPeriodBasisDoctorId());
	1289	+ patient.setLastMenstrualPeriodBasisDate(updatePatient.getLastMenstrualPeriodBasisDate());
	1290	+ patient.setLastMenstrualPeriodBasisOther(updatePatient.getLastMenstrualPeriodBasisOther());
	1291	+
	1292	+ patient.setMensStartDay(updatePatient.getMensStartDay());
	1293	+
	1294	+ patient.setMensEndDay(updatePatient.getMensEndDay());
	1295	+
	1296	+ patient.setMensStopStartDay(updatePatient.getMensStopStartDay());
	1297	+
	1298	+ patient.setMensStopEndDay(updatePatient.getMensStopEndDay());
	1299	+
	1300	+ patient.setUsername(updatePatient.getUsername());
	1301	+
	1302	+ patient.setPcerteTypeId(updatePatient.getPcerteTypeId());
	1303	+
	1304	+ patient.setCardNo(updatePatient.getCardNo());
	1305	+
	1306	+ patient.setPcountryId(updatePatient.getPcountryId());
	1307	+ patient.setPnationId(updatePatient.getPnationId());
	1308	+ patient.setBirth(updatePatient.getBirth());
	1309	+
	1310	+ patient.setPcensusTypeId(updatePatient.getPcensusTypeId());
	1311	+
	1312	+ patient.setPliveTypeId(updatePatient.getPliveTypeId());
	1313	+
	1314	+ patient.setPprofessionTypeId(updatePatient.getPprofessionTypeId());
	1315	+
	1316	+ patient.setPhone(updatePatient.getPhone());
	1317	+
	1318	+ patient.setPworkUnit(updatePatient.getPworkUnit());
	1319	+ patient.setPlevelTypeId(updatePatient.getPlevelTypeId());
	1320	+
	1321	+ //孕妇居住地
	1322	+ patient.setAddressRegister(updatePatient.getAddressRegister());
	1323	+ patient.setProvinceRegisterId(updatePatient.getProvincePostRestId());
	1324	+ patient.setCityRegisterId(updatePatient.getCityRegisterId());
	1325	+ patient.setAreaRegisterId(updatePatient.getAreaRegisterId());
	1326	+ patient.setStreetRegisterId(updatePatient.getStreetRegisterId());
	1327	+
	1328	+ //孕妇户籍地址
	1329	+ patient.setAddress(updatePatient.getAddress());
	1330	+ patient.setProvinceId(updatePatient.getProvinceId());
	1331	+ patient.setCityId(updatePatient.getCityId());
	1332	+ patient.setAreaId(updatePatient.getAreaId());
	1333	+ patient.setStreetId(updatePatient.getStreetId());
	1334	+
	1335	+ //孕妇产后修养地
	1336	+ patient.setAddressPostRest(updatePatient.getAddressPostRest());
	1337	+ patient.setProvincePostRestId(updatePatient.getProvincePostRestId());
	1338	+ patient.setCityPostRestId(updatePatient.getCityPostRestId());
	1339	+ patient.setAreaPostRestId(updatePatient.getAreaPostRestId());
	1340	+ patient.setStreetPostRestId(updatePatient.getStreetPostRestId());
	1341	+
	1342	+ //丈夫信息
	1343	+ patient.setHusbandName(updatePatient.getHusbandName());
	1344	+ patient.setHcertificateTypeId(updatePatient.getHcertificateTypeId());
	1345	+
	1346	+ patient.setHusbandBirth(updatePatient.getHusbandBirth());
	1347	+
	1348	+ patient.setHcertificateNum(updatePatient.getHcertificateNum());
	1349	+ patient.setHusbandPhone(updatePatient.getHusbandPhone());
	1350	+ patient.setHcountryId(updatePatient.getHcountryId());
	1351	+ patient.setHnationId(updatePatient.getHnationId());
	1352	+ patient.setHprofessionTypeId(updatePatient.getHprofessionTypeId());
	1353	+ patient.setHworkUnit(updatePatient.getHworkUnit());
	1354	+ patient.setHaddressRegister(updatePatient.getHaddressRegister());
	1355	+ patient.setHprovinceRegisterId(updatePatient.getHprovinceRegisterId());
	1356	+ patient.setHcityRegisterId(updatePatient.getHcityRegisterId());
	1357	+ patient.setHareaRegisterId(updatePatient.getHareaRegisterId());
	1358	+ patient.setHstreetRegisterId(updatePatient.getHstreetRegisterId());
	1359	+ patient.setHlevelTypeId(updatePatient.getHlevelTypeId());
	1360	+
	1361	+ patient.setMremark(updatePatient.getMremark());
	1362	+ patient.setServiceStatus(updatePatient.getServiceStatus());
	1363	+ patient.setServiceType(updatePatient.getServiceType());
	1364	+
	1365	+ patient.setDueDate(updatePatient.getDueDate());
	1366	+ patient.setFileCode(updatePatient.getFileCode());
	1367	+ patient.setBookbuildingDoctor(updatePatient.getBookbuildingDoctor());
	1368	+ patient.setBookbuildingDate(updatePatient.getBookbuildingDate());
	1369	+ patient.setVcCardNo(updatePatient.getVcCardNo());
1246	1370	}
1247	1371
1248	1372

...	...	@@ -3499,7 +3499,7 @@
3499	3499	map.put("fmAddr", data.getFmAddr());
3500	3500	map.put("username", patients.getUsername());
3501	3501	map.put("birth", DateUtil.getyyyy_MM_dd(patients.getBirth()));
3502		-// map.put("age", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI));
	3502	+ map.put("age", UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth(), data.getDueDate1()), UnitConstants.SUI));
3503	3503	map.put("phone", patients.getPhone());
3504	3504	map.put("fmWeek", checkWeek(patients));
3505	3505	map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
...	...	@@ -3991,7 +3991,7 @@
3991	3991	}
3992	3992	babyMap.put("babyId", temp.getId());
3993	3993	babyMap.put("dueTime", temp.getDueTime());
3994		- map.put("age", UnitUtils.unitSplice(DateUtil.getAge2(patients.getBirth(),DateUtil.parseYMDHMS(temp.getDueTime())), UnitConstants.SUI));
	3994	+
3995	3995	babyMap.put("pregnancyOut", temp.getPregnancyOut() == null ? "" : RenShenJieJuEnums.getTitle(temp.getPregnancyOut()));
3996	3996	babyMap.put("deformity", temp.getDeformity() == null ? "" : temp.getDeformity() == 1 ? "是" : "否");
3997	3997	babyMap.put("babyGender", temp.getBabyGender() == null ? "" : SexEnum.getTextById(