jiangjiazhi / regional-platform

Commit f30a7f656542fbfbb18d684aa8b4ce8ef199f333

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

初诊添加字段

Showing 8 changed files with 159 additions and 14 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java

...	...	@@ -59,6 +59,10 @@
59	59
60	60	private String phoneOrcardNo;
61	61
	62	+
	63	+ //助产机构
	64	+ private String deliverOrg;
	65	+
62	66	//畸形key
63	67	private String deformityKey;
64	68	//居住类别
...	...	@@ -206,6 +210,20 @@
206	210
207	211	private Integer endCase;
208	212
	213	+ private String areaId;
	214	+
	215	+ private String provinceId;
	216	+
	217	+ private String cityId;
	218	+ private String streetId;
	219	+
	220	+ private String source;
	221	+
	222	+ /**
	223	+ * 是否分配社区
	224	+ */
	225	+ private Boolean isNull;
	226	+
209	227	public Integer getEndCase() {
210	228	return endCase;
211	229	}
212	230
...	...	@@ -416,8 +434,13 @@
416	434	this.enableListNot = enableListNot;
417	435	}
418	436
419		- private String source;
	437	+ public String getDeliverOrg() {
	438	+ return deliverOrg;
	439	+ }
420	440
	441	+ public void setDeliverOrg(String deliverOrg) {
	442	+ this.deliverOrg = deliverOrg;
	443	+ }
421	444
422	445	public String getSource() {
423	446	return source;
424	447
...	...	@@ -499,12 +522,9 @@
499	522	this.dataStatus = dataStatus;
500	523	}
501	524
502		- /**
503		- * 是否分配社区
504		- */
505		- private Boolean isNull;
506	525
507	526
	527	+
508	528	public Integer[] getOrServiceStatus() {
509	529	return orServiceStatus;
510	530	}
511	531
...	...	@@ -545,13 +565,7 @@
545	565	this.mphone = mphone;
546	566	}
547	567
548		- private String areaId;
549	568
550		- private String provinceId;
551		-
552		- private String cityId;
553		- private String streetId;
554		-
555	569	public String getStreetId() {
556	570	return streetId;
557	571	}
...	...	@@ -834,6 +848,10 @@
834	848
835	849	if (null != liveType) {
836	850	condition = condition.and("liveType", liveType, MongoOper.IS);
	851	+ }
	852	+
	853	+ if (null != deliverOrg) {
	854	+ condition = condition.and("deliverOrg", deliverOrg, MongoOper.IS);
837	855	}
838	856
839	857	if (null != buildType) {

...	...	@@ -227,6 +227,7 @@
227	227	@RequestParam(value = "vcCardNo", required = false) String vcCardNo,
228	228	@RequestParam(value = "liveType", required = false) String liveType,
229	229	@RequestParam(value = "isArea", required = false) String isArea,
	230	+ @RequestParam(value = "hospitalId", required = false) String fmHospitalId,
230	231	@RequestParam(value = "endCase", required = false) Integer endCase
231	232	) {
232	233
...	...	@@ -239,6 +240,7 @@
239	240	}
240	241	LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
241	242	BabyManageRequest request = new BabyManageRequest();
	243	+ request.setFmHospitalId(fmHospitalId);
242	244	request.setVcCardNo(vcCardNo);
243	245	request.setWeakSonInfos(weakSonInfos);
244	246	request.setHighRiskInfos(highRiskInfos);
245	247
...	...	@@ -316,9 +318,11 @@
316	318	@RequestParam(value = "hospitalCityId", required = false) String hospitalCityId,
317	319	@RequestParam(value = "hospitalAreaId", required = false) String hospitalAreaId,
318	320	@RequestParam(value = "hospitalId", required = false) String hospitalId,
	321	+ @RequestParam(value = "hospitalId", required = false) String fmHospitalId,
319	322	@RequestParam(value = "isArea", required = false) String isArea) {
320	323	LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
321	324	BabyManageRequest request = new BabyManageRequest();
	325	+ request.setFmHospitalId(fmHospitalId);
322	326	request.setQueryNo(queryNo);
323	327	request.setBcardNo(bcardNo);
324	328	request.setMcardNo(mcardNo);

...	...	@@ -2116,6 +2116,8 @@
2116	2116
2117	2117	babyQuery.setLiveType(request.getLiveType());
2118	2118
	2119	+ babyQuery.setDeliverOrg(request.getFmHospitalId());
	2120	+
2119	2121	if (String.valueOf("true").equals(request.getIsArea())) {
2120	2122	List list = new ArrayList();
2121	2123	list.add("1");//转诊，建档已接受

...	...	@@ -663,8 +663,8 @@
663	663	babyModel.setDueDate(patients.getDueDate());
664	664	babyModel.setDueType(patients.getDueType());
665	665	babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29");
666		- babyModel.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId());
667		- babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
	666	+// babyModel.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId());
	667	+// babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
668	668	babyModel.setCreated(new Date());
669	669	babyModel.setModified(new Date());
670	670	if (null != deliverAddRequest.getDueDate()) {

...	...	@@ -89,6 +89,17 @@
89	89	//结案
90	90	private Integer endCase;
91	91
	92	+ //分娩医院
	93	+ private String fmHospitalId;
	94	+
	95	+ public String getFmHospitalId() {
	96	+ return fmHospitalId;
	97	+ }
	98	+
	99	+ public void setFmHospitalId(String fmHospitalId) {
	100	+ this.fmHospitalId = fmHospitalId;
	101	+ }
	102	+
92	103	public Integer getEndCase() {
93	104	return endCase;
94	105	}

...	...	@@ -512,6 +512,80 @@
512	512	private String pregnancyExcpetion;
513	513
514	514
	515	+ // 乙肝表面抗原
	516	+ private String ygbmkyValue;
	517	+ //乙肝表面抗体
	518	+ private String ygbmktValue;
	519	+ //乙肝e抗原
	520	+ private String ygekyValue;
	521	+ // 乙肝e抗体
	522	+ private String ygektValue;
	523	+ // 乙肝核心抗体
	524	+ private String yghxktValue;
	525	+
	526	+
	527	+ //hit抗体检测
	528	+ private String hivktValue;
	529	+
	530	+ //实验结果
	531	+ private String syjgValue;
	532	+
	533	+ public String getYgbmkyValue() {
	534	+ return ygbmkyValue;
	535	+ }
	536	+
	537	+ public void setYgbmkyValue(String ygbmkyValue) {
	538	+ this.ygbmkyValue = ygbmkyValue;
	539	+ }
	540	+
	541	+ public String getYgbmktValue() {
	542	+ return ygbmktValue;
	543	+ }
	544	+
	545	+ public void setYgbmktValue(String ygbmktValue) {
	546	+ this.ygbmktValue = ygbmktValue;
	547	+ }
	548	+
	549	+ public String getYgekyValue() {
	550	+ return ygekyValue;
	551	+ }
	552	+
	553	+ public void setYgekyValue(String ygekyValue) {
	554	+ this.ygekyValue = ygekyValue;
	555	+ }
	556	+
	557	+ public String getYgektValue() {
	558	+ return ygektValue;
	559	+ }
	560	+
	561	+ public void setYgektValue(String ygektValue) {
	562	+ this.ygektValue = ygektValue;
	563	+ }
	564	+
	565	+ public String getYghxktValue() {
	566	+ return yghxktValue;
	567	+ }
	568	+
	569	+ public void setYghxktValue(String yghxktValue) {
	570	+ this.yghxktValue = yghxktValue;
	571	+ }
	572	+
	573	+ public String getHivktValue() {
	574	+ return hivktValue;
	575	+ }
	576	+
	577	+ public void setHivktValue(String hivktValue) {
	578	+ this.hivktValue = hivktValue;
	579	+ }
	580	+
	581	+ public String getSyjgValue() {
	582	+ return syjgValue;
	583	+ }
	584	+
	585	+ public void setSyjgValue(String syjgValue) {
	586	+ this.syjgValue = syjgValue;
	587	+ }
	588	+
515	589	public String getfTthree() {
516	590	return fTthree;
517	591	}
...	...	@@ -1814,7 +1888,7 @@
1814	1888	setCervical(antExChuModel.getCervical());
1815	1889	setUterus(antExChuModel.getUterus());
1816	1890	setFujian(antExChuModel.getFujian());
1817		- setYghxkt(antExChuModel.getYghxkt());
	1891	+
1818	1892	setPregnancyTimes(antExChuModel.getPregnancyTimes());
1819	1893	setProdTime(antExChuModel.getProdTime());
1820	1894	setDelivery(antExChuModel.getDelivery());
1821	1895
...	...	@@ -1898,9 +1972,21 @@
1898	1972	setYgbmkt(antExChuModel.getYgbmkt());
1899	1973	setYgeky(antExChuModel.getYgeky());
1900	1974	setYgekt(antExChuModel.getYgekt());
	1975	+ setYghxkt(antExChuModel.getYghxkt());
	1976	+
1901	1977	setXqjq(antExChuModel.getXqjq());
1902	1978	setXnsd(antExChuModel.getXnsd());
1903	1979	setHivkt(antExChuModel.getHivkt());
	1980	+
	1981	+ setYgbmkyValue(antExChuModel.getYgbmkyValue());
	1982	+ setYgbmktValue(antExChuModel.getYgbmktValue());
	1983	+ setYgekyValue(antExChuModel.getYgekyValue());
	1984	+ setYgektValue(antExChuModel.getYgektValue());
	1985	+ setYghxktValue(antExChuModel.getYghxktValue());
	1986	+
	1987	+ setHivktValue(antExChuModel.getHivktValue());
	1988	+ setSyjgValue(antExChuModel.getSyjgValue());
	1989	+
1904	1990	setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class));
1905	1991	setYdqjd(antExChuModel.getYdqjd());
1906	1992	if (null != antExChuModel.getDueDate()) {

...	...	@@ -71,6 +71,17 @@
71	71
72	72	private String endCaseTime;
73	73
	74	+ //分娩机构
	75	+ private String fmHospitalName;
	76	+
	77	+ public String getFmHospitalName() {
	78	+ return fmHospitalName;
	79	+ }
	80	+
	81	+ public void setFmHospitalName(String fmHospitalName) {
	82	+ this.fmHospitalName = fmHospitalName;
	83	+ }
	84	+
74	85	public String getEndCase() {
75	86	return endCase;
76	87	}

...	...	@@ -156,6 +156,19 @@
156	156	}
157	157	}
158	158	result.setDiagnose(StringUtils.emptyDeal(diagnose));
	159	+
	160	+
	161	+ String fmHospitalName = "";
	162	+ if (StringUtils.isNum(model.getDeliverOrg()))
	163	+ {
	164	+ fmHospitalName = organizationService.getOrganization(Integer.valueOf(model.getDeliverOrg())).getName();
	165	+ }
	166	+ else
	167	+ {
	168	+ fmHospitalName = model.getDeliverOrg() == null ? "" : model.getDeliverOrg();
	169	+ }
	170	+ result.setFmHospitalName(fmHospitalName);
	171	+
159	172	list.add(result);
160	173	}
161	174	}