jiangjiazhi / regional-platform

Commit b0e51448c9b4f0e1860d48e617310cf7c160e992

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 167 additions and 14 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java

...	...	@@ -480,12 +480,20 @@
480	480	private String assistHospitalId;
481	481
482	482	//婚检时间（婚前指导配套）
483		- private Date premaritalUpTime;
	483	+ private Date guidTime;
484	484	//婚前指导医生（婚前指导配套）
485		- private String hunJianDoctor;
	485	+ private String guidDoctor;
486	486	//婚前指导签名（婚前指导配套）
487	487	private String guidSign;
488		- //医院ID（婚前指导配套）
	488	+ //婚前指导医院（婚前指导配套）
	489	+ private String guidHospitalId;
	490	+
	491	+
	492	+ //婚检时间（基础字段）
	493	+ private Date premaritalUpTime;
	494	+ //婚前指导医生（基础字段）
	495	+ private String hunJianDoctor;
	496	+ //医院ID（基础字段）
489	497	private String hospitalId;
490	498
491	499	//用户签名
...	...	@@ -572,6 +580,34 @@
572	580	private String lqj;
573	581	//胺臭味试验26
574	582	private String acwsy;
	583	+
	584	+ public static long getSerialVersionUID() {
	585	+ return serialVersionUID;
	586	+ }
	587	+
	588	+ public Date getGuidTime() {
	589	+ return guidTime;
	590	+ }
	591	+
	592	+ public void setGuidTime(Date guidTime) {
	593	+ this.guidTime = guidTime;
	594	+ }
	595	+
	596	+ public String getGuidDoctor() {
	597	+ return guidDoctor;
	598	+ }
	599	+
	600	+ public void setGuidDoctor(String guidDoctor) {
	601	+ this.guidDoctor = guidDoctor;
	602	+ }
	603	+
	604	+ public String getGuidHospitalId() {
	605	+ return guidHospitalId;
	606	+ }
	607	+
	608	+ public void setGuidHospitalId(String guidHospitalId) {
	609	+ this.guidHospitalId = guidHospitalId;
	610	+ }
575	611
576	612	public Date getBaseTime() {
577	613	return baseTime;

...	...	@@ -269,6 +269,8 @@
269	269	checkupResult.setRepTime(DateUtil.getyyyy_MM_dd(result.getRepTime()));
270	270	checkupResult.setClinicTime(DateUtil.getyyyy_MM_dd(result.getClinicTime()));
271	271	checkupResult.setAssistTime(DateUtil.getyyyy_MM_dd(result.getAssistTime()));
	272	+ checkupResult.setGuidTime(DateUtil.getyyyy_MM_dd(result.getGuidTime()));
	273	+
272	274	checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
273	275
274	276	checkupResult.setBaseDoctor(result.getBaseDoctor());
...	...	@@ -276,6 +278,7 @@
276	278	checkupResult.setRepDoctor(result.getRepDoctor());
277	279	checkupResult.setClinicDoctor(result.getClinicDoctor());
278	280	checkupResult.setAssistDoctor(result.getAssistDoctor());
	281	+ checkupResult.setGuidDoctor(result.getGuidDoctor());
279	282	checkupResult.setHunJianDoctor(result.getHunJianDoctor());
280	283
281	284	checkupResult.setBaseSign(result.getBaseSign());
...	...	@@ -292,6 +295,8 @@
292	295	checkupResult.setRepHospitalId(result.getRepHospitalId());
293	296	checkupResult.setClinicHospitalId(result.getClinicHospitalId());
294	297	checkupResult.setAssistHospitalId(result.getAssistHospitalId());
	298	+ checkupResult.setGuidHospitalId(result.getGuidHospitalId());
	299	+
295	300	checkupResult.setHospitalId(result.getHospitalId());
296	301
297	302	checkupResult.setPublishId(result.getPublishId());
...	...	@@ -981,6 +986,7 @@
981	986	checkup.setRepTime(DateUtil.parseYMD(addRequest.getRepTime()));
982	987	checkup.setClinicTime(DateUtil.parseYMD(addRequest.getClinicTime()));
983	988	checkup.setAssistTime(DateUtil.parseYMD(addRequest.getAssistTime()));
	989	+ checkup.setGuidTime(DateUtil.parseYMD(addRequest.getGuidTime()));
984	990	checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime()));
985	991
986	992	checkup.setBaseDoctor(addRequest.getBaseDoctor());
...	...	@@ -988,6 +994,7 @@
988	994	checkup.setRepDoctor(addRequest.getRepDoctor());
989	995	checkup.setClinicDoctor(addRequest.getClinicDoctor());
990	996	checkup.setAssistDoctor(addRequest.getAssistDoctor());
	997	+ checkup.setGuidDoctor(addRequest.getGuidDoctor());
991	998	checkup.setHunJianDoctor(addRequest.getHunJianDoctor());
992	999
993	1000	checkup.setBaseSign(addRequest.getBaseSign());
...	...	@@ -1002,6 +1009,7 @@
1002	1009	checkup.setRepHospitalId(addRequest.getRepHospitalId());
1003	1010	checkup.setClinicHospitalId(addRequest.getClinicHospitalId());
1004	1011	checkup.setAssistHospitalId(addRequest.getAssistHospitalId());
	1012	+ checkup.setGuidHospitalId(addRequest.getGuidHospitalId());
1005	1013	checkup.setHospitalId(addRequest.getHospitalId());
1006	1014
1007	1015	checkup.setUserSign(addRequest.getUserSign());
...	...	@@ -1918,6 +1926,7 @@
1918	1926	checkupResult.setRepTime(DateUtil.getyyyy_MM_dd(result.getRepTime()));
1919	1927	checkupResult.setClinicTime(DateUtil.getyyyy_MM_dd(result.getClinicTime()));
1920	1928	checkupResult.setAssistTime(DateUtil.getyyyy_MM_dd(result.getAssistTime()));
	1929	+ checkupResult.setGuidTime(DateUtil.getyyyy_MM_dd(result.getGuidTime()));
1921	1930	checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
1922	1931
1923	1932	String baseDoctor = "";
...	...	@@ -1965,6 +1974,15 @@
1965	1974	}
1966	1975	checkupResult.setAssistDoctor(assistDoctor);
1967	1976
	1977	+ String guidDoctor = "";
	1978	+ if (result.getGuidDoctor() != null) {
	1979	+ Users users = usersService.getUsers(Integer.parseInt(result.getGuidDoctor()));
	1980	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1981	+ guidDoctor = users.getName();
	1982	+ }
	1983	+ }
	1984	+ checkupResult.setGuidDoctor(guidDoctor);
	1985	+
1968	1986	String hunJianDoctor = "";
1969	1987	if (result.getHunJianDoctor() != null) {
1970	1988	Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor()));
...	...	@@ -2011,6 +2029,12 @@
2011	2029	Organization organization = organizationService.getOrganization(Integer.valueOf(result.getAssistHospitalId()));
2012	2030	if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
2013	2031	checkupResult.setAssistHospitalId(organization.getName());
	2032	+ }
	2033	+ }
	2034	+ if (result.getGuidHospitalId() != null) {
	2035	+ Organization organization = organizationService.getOrganization(Integer.valueOf(result.getGuidHospitalId()));
	2036	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	2037	+ checkupResult.setGuidHospitalId(organization.getName());
2014	2038	}
2015	2039	}
2016	2040	if (result.getHospitalId() != null) {

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.common.core.annotation.form.Form;
4	4	import com.lyms.platform.pojo.DoctorModel;
5	5
	6	+import java.util.Date;
6	7	import java.util.Map;
7	8
8	9	/**
9	10
10	11
...	...	@@ -477,12 +478,19 @@
477	478	private String assistHospitalId;
478	479
479	480	//婚检时间（婚前指导配套）
480		- private String premaritalUpTime;
	481	+ private String guidTime;
481	482	//婚前指导医生（婚前指导配套）
482		- private String hunJianDoctor;
	483	+ private String guidDoctor;
483	484	//婚前指导签名（婚前指导配套）
484	485	private String guidSign;
485		- //医院ID（婚前指导配套）
	486	+ //婚前指导医院（婚前指导配套）
	487	+ private String guidHospitalId;
	488	+
	489	+ //婚检时间（基础字段）
	490	+ private String premaritalUpTime;
	491	+ //婚前指导医生（基础字段）
	492	+ private String hunJianDoctor;
	493	+ //医院ID（基础字段）
486	494	private String hospitalId;
487	495
488	496	//用户签名
...	...	@@ -563,6 +571,30 @@
563	571	private String lqj;
564	572	//胺臭味试验26
565	573	private String acwsy;
	574	+
	575	+ public String getGuidTime() {
	576	+ return guidTime;
	577	+ }
	578	+
	579	+ public void setGuidTime(String guidTime) {
	580	+ this.guidTime = guidTime;
	581	+ }
	582	+
	583	+ public String getGuidDoctor() {
	584	+ return guidDoctor;
	585	+ }
	586	+
	587	+ public void setGuidDoctor(String guidDoctor) {
	588	+ this.guidDoctor = guidDoctor;
	589	+ }
	590	+
	591	+ public String getGuidHospitalId() {
	592	+ return guidHospitalId;
	593	+ }
	594	+
	595	+ public void setGuidHospitalId(String guidHospitalId) {
	596	+ this.guidHospitalId = guidHospitalId;
	597	+ }
566	598
567	599	public String getBaseTime() {
568	600	return baseTime;

...	...	@@ -512,17 +512,46 @@
512	512	//辅助检查医院（辅助检查配套）
513	513	private String assistHospitalId;
514	514
515		- //婚检日期（婚前指导配套）
516		- private String hunJianDate;
	515	+ //婚检时间（婚前指导配套）
	516	+ private String guidTime;
517	517	//婚前指导医生（婚前指导配套）
518		- private String hunJianDoctor;
	518	+ private String guidDoctor;
519	519	//婚前指导签名（婚前指导配套）
520	520	private String guidSign;
521		- //婚检医院（婚前指导配套）
	521	+ //婚前指导医院（婚前指导配套）
	522	+ private String guidHospitalId;
	523	+
	524	+ //婚检日期（基础字段）
	525	+ private String hunJianDate;
	526	+ //婚前指导医生（基础字段）
	527	+ private String hunJianDoctor;
	528	+ //婚检医院（基础字段）
522	529	private String hunJianHospital;
523	530
524		-/************************************************************************/
	531	+ public String getGuidTime() {
	532	+ return guidTime;
	533	+ }
525	534
	535	+ public void setGuidTime(String guidTime) {
	536	+ this.guidTime = guidTime;
	537	+ }
	538	+
	539	+ public String getGuidDoctor() {
	540	+ return guidDoctor;
	541	+ }
	542	+
	543	+ public void setGuidDoctor(String guidDoctor) {
	544	+ this.guidDoctor = guidDoctor;
	545	+ }
	546	+
	547	+
	548	+ public String getGuidHospitalId() {
	549	+ return guidHospitalId;
	550	+ }
	551	+
	552	+ public void setGuidHospitalId(String guidHospitalId) {
	553	+ this.guidHospitalId = guidHospitalId;
	554	+ }
526	555	public String getBaseTime() {
527	556	return baseTime;
528	557	}

...	...	@@ -534,13 +534,45 @@
534	534	private String assistHospitalId;
535	535
536	536	//婚检时间（婚前指导配套）
537		- private String premaritalUpTime;
	537	+ private String guidTime;
538	538	//婚前指导医生（婚前指导配套）
539		- private String hunJianDoctor;
	539	+ private String guidDoctor;
540	540	//婚前指导签名（婚前指导配套）
541	541	private String guidSign;
542		- //医院ID（婚前指导配套）
	542	+ //婚前指导医院（婚前指导配套）
	543	+ private String guidHospitalId;
	544	+
	545	+
	546	+ //婚检时间（基础字段）
	547	+ private String premaritalUpTime;
	548	+ //婚前指导医生（基础字段）
	549	+ private String hunJianDoctor;
	550	+ //医院ID（基础字段）
543	551	private String hospitalId;
	552	+
	553	+ public String getGuidHospitalId() {
	554	+ return guidHospitalId;
	555	+ }
	556	+
	557	+ public void setGuidHospitalId(String guidHospitalId) {
	558	+ this.guidHospitalId = guidHospitalId;
	559	+ }
	560	+
	561	+ public String getGuidTime() {
	562	+ return guidTime;
	563	+ }
	564	+
	565	+ public void setGuidTime(String guidTime) {
	566	+ this.guidTime = guidTime;
	567	+ }
	568	+
	569	+ public String getGuidDoctor() {
	570	+ return guidDoctor;
	571	+ }
	572	+
	573	+ public void setGuidDoctor(String guidDoctor) {
	574	+ this.guidDoctor = guidDoctor;
	575	+ }
544	576
545	577	public String getBaseTime() {
546	578	return baseTime;