jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 70 additions and 4 deletions

...	...	@@ -19,7 +19,8 @@
19	19	private static final long serialVersionUID = SerialIdEnum.Patients.getCid();
20	20	/20201130 null历史\|\|1 不是特殊产筛建档, 2 衡水特殊产筛建档 /
21	21	private String screening;
22		-
	22	+ //是否预约住院分娩医院(秦皇岛定制) 1 否 2是
	23	+ private String isYyzyfmHospital;
23	24	//预约住院分娩医院(滦平定制)
24	25	private String yyzyfmHospitalId;
25	26
...	...	@@ -405,6 +406,14 @@
405	406	private String firstCheckId;
406	407	//初诊时间
407	408	private Date firstCheckTime;
	409	+
	410	+ public String getIsYyzyfmHospital() {
	411	+ return isYyzyfmHospital;
	412	+ }
	413	+
	414	+ public void setIsYyzyfmHospital(String isYyzyfmHospital) {
	415	+ this.isYyzyfmHospital = isYyzyfmHospital;
	416	+ }
408	417
409	418	public String getFirstCheckId() {
410	419	return firstCheckId;

...	...	@@ -388,6 +388,38 @@
388	388	}
389	389
390	390
	391	+ @RequestMapping(value = "/organizationByCityId", method = RequestMethod.GET)
	392	+ @ResponseBody
	393	+ @TokenRequired
	394	+ public Map organizationByCityId(HttpServletRequest request,
	395	+ @RequestParam(value = "cityId", required = false) String cityId) {
	396	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	397	+ organizationQuery.setCityId(cityId);
	398	+
	399	+ List<Map> datas = new ArrayList<>();
	400	+ List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
	401	+ if (CollectionUtils.isNotEmpty(organizations)) {
	402	+ for (Organization organization : organizations) {
	403	+ Map data = new HashMap();
	404	+ data.put("id",organization.getId());
	405	+ data.put("name",organization.getName());
	406	+ datas.add(data);
	407	+ }
	408	+ }
	409	+
	410	+ Map<String, String> mapqt = new HashMap<>();
	411	+ mapqt.put("id","-1");
	412	+ mapqt.put("name", "其他");
	413	+ datas.add(mapqt);
	414	+
	415	+ Map<String, Object> map = new HashMap<>();
	416	+ map.put("data", datas);
	417	+ map.put("errormsg", "成功");
	418	+ map.put("errorcode", ErrorCodeConstants.SUCCESS);
	419	+ return map;
	420	+ }
	421	+
	422	+
391	423	/**
392	424	* 获取列表
393	425	*/

...	...	@@ -1808,7 +1808,7 @@
1808	1808	public boolean hsHuadaSaveSampleInfo(HuadaSieveApplyOrderAddRequest sieveHuada) {
1809	1809	try {
1810	1810	//设置固定值，
1811		- sieveHuada.setInformedConsent("02");
	1811	+ sieveHuada.setInformedConsent("01"); //是否签署知情同意书（01-同意捐献、02-不同意捐献、03-未签署知情同意书）
1812	1812	sieveHuada.setInformedConsentVersion("02");
1813	1813	sieveHuada.setGestationalWeeks(getWeeks(sieveHuada.getGestationalWeeks()));//孕周
1814	1814	sieveHuada.setChargeType("3");

...	...	@@ -1768,6 +1768,7 @@
1768	1768	*/
1769	1769	public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
1770	1770	Patients patient = new Patients();
	1771	+ patient.setIsYyzyfmHospital(yunRequest.getIsYyzyfmHospital());
1771	1772	patient.setNormal(yunRequest.getNormal());
1772	1773	patient.setChildExtAddrs(yunRequest.getChildExtAddrs());
1773	1774	//默认为未分娩
...	...	@@ -2036,6 +2037,7 @@
2036	2037
2037	2038	public PregnantInfoResult getResult(Patients p) {
2038	2039	PregnantInfoResult result = new PregnantInfoResult();
	2040	+ result.setIsYyzyfmHospital(p.getIsYyzyfmHospital());
2039	2041	result.setChildExtAddrs(p.getChildExtAddrs());
2040	2042	result.setReqHusband(p.getReqHusband());
2041	2043	result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther());

...	...	@@ -17,6 +17,10 @@
17	17	/20201130 null历史\|\|1 不是特殊产筛建档, 2 衡水特殊产筛建档 /
18	18	private String screening;
19	19
	20	+
	21	+ //是否预约住院分娩医院(秦皇岛定制) 1 否 2是
	22	+ private String isYyzyfmHospital;
	23	+
20	24	//预约住院分娩医院(滦平定制)
21	25	private String yyzyfmHospitalId;
22	26
...	...	@@ -489,6 +493,13 @@
489	493	//丈夫年龄
490	494	private Integer hmarriageAge;
491	495
	496	+ public String getIsYyzyfmHospital() {
	497	+ return isYyzyfmHospital;
	498	+ }
	499	+
	500	+ public void setIsYyzyfmHospital(String isYyzyfmHospital) {
	501	+ this.isYyzyfmHospital = isYyzyfmHospital;
	502	+ }
492	503
493	504	public Integer getHmarriageAge() {
494	505	return hmarriageAge;

...	...	@@ -9,6 +9,9 @@
9	9	* Created by Administrator on 2016/6/15.
10	10	*/
11	11	public class PregnantInfoResult {
	12	+ //是否预约住院分娩医院(秦皇岛定制) 1 否 2是
	13	+ private String isYyzyfmHospital;
	14	+
12	15	private Map<String, String> yyzyfmHospitalId;
13	16	/20201130 null历史\|\|1 不是特殊产筛建档, 2 衡水特殊产筛建档 /
14	17	private String screening;
...	...	@@ -44,6 +47,15 @@
44	47	*/
45	48	//空或者1为正常 2为补录
46	49	private String normal;
	50	+
	51	+
	52	+ public String getIsYyzyfmHospital() {
	53	+ return isYyzyfmHospital;
	54	+ }
	55	+
	56	+ public void setIsYyzyfmHospital(String isYyzyfmHospital) {
	57	+ this.isYyzyfmHospital = isYyzyfmHospital;
	58	+ }
47	59
48	60	public String getNormal() {
49	61	return normal;

...	...	@@ -103,11 +103,11 @@
103	103	if (StringUtils.isNotEmpty(model.getLastCheckDoctor()))
104	104	{
105	105	try {
106		- String userName = usersService.getUsers(Integer.parseInt(model.getBuildDoctor())).getName();
	106	+ String userName = usersService.getUsers(Integer.parseInt(model.getLastCheckDoctor())).getName();
107	107	result.setLastCheckDoctor(userName);
108	108	}catch (Exception e)
109	109	{
110		- result.setLastCheckDoctor("产科病房");
	110	+ result.setLastCheckDoctor("");
111	111	}
112	112	}
113	113