jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 12 changed files with 68 additions and 12 deletions

...	...	@@ -44,5 +44,7 @@
44	44	List<Organization> getOrganizationByHosps(@Param("hospPermissions") List<String> hospPermissions);
45	45
46	46	List<Organization> getOrganizationByHospsHs(@Param("hospPermissions") List<String> hospPermissions);
	47	+
	48	+ String getAreaCode(String areaName);
47	49	}

...	...	@@ -48,5 +48,7 @@
48	48
49	49	List<Organization> getOrganizationByHosps(List<String> hospPermissions);
50	50	List<Organization> getOrganizationByHospsHs(List<String> hospPermissions);
	51	+
	52	+ String getAreaCode(String areaName);
51	53	}

...	...	@@ -29,7 +29,7 @@
29	29
30	30	Integer getUserId(String hospitalId, String doctorName);
31	31
32		- Long getBabySeq();
	32	+ Long getBabySeq(String year);
33	33
34	34	}

...	...	@@ -333,5 +333,11 @@
333	333	return masterOrganizationMapper.getOrganizationByHospsHs(hospPermissions);
334	334	}
335	335
	336	+ @Override
	337	+ public String getAreaCode(String areaName) {
	338	+ String code = masterOrganizationMapper.getAreaCode(areaName);
	339	+ return StringUtils.isNotEmpty(code) ? code : "110000";
	340	+ }
	341	+
336	342	}

...	...	@@ -121,8 +121,7 @@
121	121	}
122	122
123	123	@Override
124		- public synchronized Long getBabySeq() {
125		- String yearStr = DateUtil.getYearStr();
	124	+ public synchronized Long getBabySeq(String yearStr) {
126	125	usersMapper.updateSeq(yearStr);
127	126	Long seq = usersMapper.getBabySeq(yearStr);
128	127	return seq;

...	...	@@ -303,5 +303,9 @@
303	303	#{item}
304	304	</foreach>
305	305	</select>
	306	+
	307	+ <select id="getAreaCode" resultType="String" parameterType="String">
	308	+ select code from area a where a.name=#{areaName}
	309	+ </select>
306	310	</mapper>

...	...	@@ -441,6 +441,18 @@
441	441	lock.unlock();
442	442	}
443	443	}
	444	+
	445	+
	446	+ public static String getYearStr(Date date) {
	447	+ lock.lock();
	448	+ try {
	449	+ return yyyy.format(date);
	450	+ } catch (Exception e) {
	451	+ return null;
	452	+ } finally {
	453	+ lock.unlock();
	454	+ }
	455	+ }
444	456	public static Date yyyyMMParse(String time) {
445	457	Date date = null;
446	458	try {

...	...	@@ -735,6 +735,17 @@
735	735	private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他
736	736	private String otherInfo;
737	737
	738	+ //儿童出生序列号
	739	+ private String babySeq;
	740	+
	741	+ public String getBabySeq() {
	742	+ return babySeq;
	743	+ }
	744	+
	745	+ public void setBabySeq(String babySeq) {
	746	+ this.babySeq = babySeq;
	747	+ }
	748	+
738	749	public Baby() {
739	750
740	751	}

...	...	@@ -38,8 +38,6 @@
38	38	@Autowired
39	39	private UsersService usersService;
40	40	@Autowired
41		- private TokenService tokenService;
42		- @Autowired
43	41	private OrganizationService organizationService;
44	42	@Autowired
45	43	private BasicConfigService basicConfigService;
46	44
...	...	@@ -47,9 +45,8 @@
47	45	private DepartmentsService departmentsService;
48	46	@Autowired
49	47	private AutoMatchFacade autoMatchFacade;
	48	+
50	49	@Autowired
51		- private UserOrganizationMapsService userOrganizationMapsService;
52		- @Autowired
53	50	private AccessPermissionFacade accessPermissionFacade;
54	51	@Autowired
55	52	private OperateLogFacade operateLogFacade;
...	...	@@ -533,6 +530,16 @@
533	530	map.put("foreignId", organization.getForeignId());
534	531	map.put("code", organization.getShortCode());
535	532	return map;
	533	+ }
	534	+
	535	+
	536	+ @RequestMapping(value = "/getAreaCode", method = RequestMethod.GET)
	537	+ @ResponseBody
	538	+ public String getAreaCode(@RequestParam(value = "areaName", required = true) String areaName) {
	539	+
	540	+ String areaCode = organizationService.getAreaCode(areaName);
	541	+ System.out.println(areaName+"==="+areaCode);
	542	+ return areaCode;
536	543	}
537	544	}

...	...	@@ -1480,10 +1480,10 @@
1480	1480	}
1481	1481
1482	1482
1483		- @RequestMapping(value = "/getBabySeq", method = RequestMethod.GET)
	1483	+ @RequestMapping(value = "/getBabyseq", method = RequestMethod.GET)
1484	1484	@ResponseBody
1485		- public String getBabySeq() {
1486		- Long seq = usersService.getBabySeq();
	1485	+ public String getBabySeq(String year) {
	1486	+ Long seq = usersService.getBabySeq(year);
1487	1487	return String.valueOf(seq);
1488	1488	}
1489	1489	}

...	...	@@ -417,8 +417,6 @@
417	417	patientsLocal.setGcdfDoctorId(deliverAddRequest.getGcdfDoctorId());//全部产妇管理要使用作为查询条件
418	418	// HuJiaqi添加结束
419	419	patientsService.updatePatient(patientsLocal);
420		- /20201128 wtt 排查使用/
421		- operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), patientsLocal, OptActionEnums.ADD.getId(), "patientsLocal分娩出院小结排查使用");
422	420
423	421	//修改分娩日期
424	422	updatePatientFmDate(patients1.getPid(), fmDate, 1, patients1.getLastMenses());
...	...	@@ -458,6 +456,20 @@
458	456	if (StringUtils.isEmpty(baby.getId())) {//如果是空则创建一个uuid，但是baby表还是没有数据，处理办法是医生手动去建档（泉渝说）
459	457	baby.setId(com.lyms.platform.common.utils.StringUtils.uuid());
460	458	}
	459	+ try{
	460	+ Organization o = organizationService.getOrganization(Integer.parseInt(maternalDeliverModel.getFmHospital()));
	461	+ String areaId = o.getAreaId();
	462	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(areaId);
	463	+ String areaName = basicConfig.getName();
	464	+ String areaCode = organizationService.getAreaCode(areaName);
	465	+ Long seq = usersService.getBabySeq(DateUtil.getYearStr(DateUtil.parseYMDHM(baby.getDueTime())));
	466	+ baby.setBabySeq(areaCode+String.valueOf(seq));
	467	+ }catch (Exception e)
	468	+ {
	469	+ ExceptionUtils.catchException(e,"baby seq error.");
	470	+ }
	471	+
	472	+
461	473	}
462	474
463	475	//新增分娩信息

...	...	@@ -7360,6 +7360,7 @@
7360	7360	Map <String, Object> map = new HashMap <>();
7361	7361	//新生儿性别
7362	7362	map.put("babyid", baby.getId());
	7363	+ map.put("babyseq", baby.getBabySeq());
7363	7364	//新生儿主键
7364	7365	map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById(
7365	7366	Integer.parseInt(baby.getBabyGender())));