jiangjiazhi / regional-platform

Commit dce5877d5b92d16fa74e8a7b0790e2e163b46926

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

隆化-隆化-男女婚检分模块增加字段，检查时间、检查医生、签名、检查医院

Showing 5 changed files with 923 additions and 100 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

...	...	@@ -26,10 +26,6 @@
26	26	private String jczt;
27	27	//加上绝经 1否 2 是
28	28	private String fkjjState;
29		- //婚检时间
30		- private Date premaritalUpTime;
31		- //医院ID
32		- private String hospitalId;
33	29	//创建时间
34	30	private Date created;
35	31	//修改时间
...	...	@@ -379,8 +375,6 @@
379	375	private String yiJianQiTaDetails;
380	376	//指导意见
381	377	private String zhiDaoYiJian;
382		- //婚检医生
383		- private String hunJianDoctor;
384	378	//婚前卫生咨询
385	379	private String hunqianHealth;
386	380	//咨询指导结果
387	381
388	382
389	383
390	384
391	385
392	386
393	387
...	...	@@ -440,17 +434,59 @@
440	434	private String seJue;
441	435
442	436
443		- //婚检信息签名
	437	+ //婚检信息时间（婚检信息配套）
	438	+ private Date baseTime;
	439	+ //婚检信息医生（婚检信息配套）
	440	+ private String baseDoctor;
	441	+ //婚检信息医生签名（婚检信息配套）
444	442	private String baseSign;
	443	+ //婚检查医院（婚检信息配套）
	444	+ private String baseHospitalId;
445	445
446		- //体格检查签名
	446	+ //体格检查时间（体格检查配套）
	447	+ private Date physiqueTime;
	448	+ //体格检查医生（体格检查配套）
	449	+ private String physiqueDoctor;
	450	+ //体格检查签名（体格检查配套）
447	451	private String physiqueSign;
	452	+ //体格检查医院（体格检查配套）
	453	+ private String physiqueHospitalId;
448	454
449		- //生殖检查签名
	455	+ //生殖检查时间（生殖检查配套）
	456	+ private Date repTime;
	457	+ //生殖检查医生（生殖检查配套）
	458	+ private String repDoctor;
	459	+ //生殖检查签名（生殖检查配套）
450	460	private String repSign;
	461	+ //生殖检查医院（生殖检查配套）
	462	+ private String repHospitalId;
451	463
452		- //婚前指导签名
	464	+ //临床检查时间（临床检查配套）
	465	+ private Date clinicTime;
	466	+ //临床检查医生（临床检查配套）
	467	+ private String clinicDoctor;
	468	+ //临床检查签名（临床检查配套）
	469	+ private String clinicSign;
	470	+ //临床检查医院（临床检查配套）
	471	+ private String clinicHospitalId;
	472	+
	473	+ //辅助检查时间（辅助检查配套）
	474	+ private Date assistTime;
	475	+ //辅助检查医生（辅助检查配套）
	476	+ private String assistDoctor;
	477	+ //辅助检查签名（辅助检查配套）
	478	+ private String assistSign;
	479	+ //辅助检查医院（辅助检查配套）
	480	+ private String assistHospitalId;
	481	+
	482	+ //婚检时间（婚前指导配套）
	483	+ private Date premaritalUpTime;
	484	+ //婚前指导医生（婚前指导配套）
	485	+ private String hunJianDoctor;
	486	+ //婚前指导签名（婚前指导配套）
453	487	private String guidSign;
	488	+ //医院ID（婚前指导配套）
	489	+ private String hospitalId;
454	490
455	491	//用户签名
456	492	private String userSign;
457	493
...	...	@@ -537,7 +573,145 @@
537	573	//胺臭味试验26
538	574	private String acwsy;
539	575
	576	+ public Date getBaseTime() {
	577	+ return baseTime;
	578	+ }
	579	+
	580	+ public void setBaseTime(Date baseTime) {
	581	+ this.baseTime = baseTime;
	582	+ }
	583	+
	584	+ public String getBaseDoctor() {
	585	+ return baseDoctor;
	586	+ }
	587	+
	588	+ public void setBaseDoctor(String baseDoctor) {
	589	+ this.baseDoctor = baseDoctor;
	590	+ }
	591	+
	592	+ public String getBaseHospitalId() {
	593	+ return baseHospitalId;
	594	+ }
	595	+
	596	+ public void setBaseHospitalId(String baseHospitalId) {
	597	+ this.baseHospitalId = baseHospitalId;
	598	+ }
	599	+
	600	+ public Date getPhysiqueTime() {
	601	+ return physiqueTime;
	602	+ }
	603	+
	604	+ public void setPhysiqueTime(Date physiqueTime) {
	605	+ this.physiqueTime = physiqueTime;
	606	+ }
	607	+
	608	+ public String getPhysiqueDoctor() {
	609	+ return physiqueDoctor;
	610	+ }
	611	+
	612	+ public void setPhysiqueDoctor(String physiqueDoctor) {
	613	+ this.physiqueDoctor = physiqueDoctor;
	614	+ }
	615	+
	616	+ public String getPhysiqueHospitalId() {
	617	+ return physiqueHospitalId;
	618	+ }
	619	+
	620	+ public void setPhysiqueHospitalId(String physiqueHospitalId) {
	621	+ this.physiqueHospitalId = physiqueHospitalId;
	622	+ }
	623	+
	624	+ public Date getRepTime() {
	625	+ return repTime;
	626	+ }
	627	+
	628	+ public void setRepTime(Date repTime) {
	629	+ this.repTime = repTime;
	630	+ }
	631	+
	632	+ public String getRepDoctor() {
	633	+ return repDoctor;
	634	+ }
	635	+
	636	+ public void setRepDoctor(String repDoctor) {
	637	+ this.repDoctor = repDoctor;
	638	+ }
	639	+
	640	+ public String getRepHospitalId() {
	641	+ return repHospitalId;
	642	+ }
	643	+
	644	+ public void setRepHospitalId(String repHospitalId) {
	645	+ this.repHospitalId = repHospitalId;
	646	+ }
	647	+
	648	+ public Date getClinicTime() {
	649	+ return clinicTime;
	650	+ }
	651	+
	652	+ public void setClinicTime(Date clinicTime) {
	653	+ this.clinicTime = clinicTime;
	654	+ }
	655	+
	656	+ public String getClinicDoctor() {
	657	+ return clinicDoctor;
	658	+ }
	659	+
	660	+ public void setClinicDoctor(String clinicDoctor) {
	661	+ this.clinicDoctor = clinicDoctor;
	662	+ }
	663	+
	664	+ public String getClinicSign() {
	665	+ return clinicSign;
	666	+ }
	667	+
	668	+ public void setClinicSign(String clinicSign) {
	669	+ this.clinicSign = clinicSign;
	670	+ }
	671	+
	672	+ public String getClinicHospitalId() {
	673	+ return clinicHospitalId;
	674	+ }
	675	+
	676	+ public void setClinicHospitalId(String clinicHospitalId) {
	677	+ this.clinicHospitalId = clinicHospitalId;
	678	+ }
	679	+
	680	+ public Date getAssistTime() {
	681	+ return assistTime;
	682	+ }
	683	+
	684	+ public void setAssistTime(Date assistTime) {
	685	+ this.assistTime = assistTime;
	686	+ }
	687	+
	688	+ public String getAssistDoctor() {
	689	+ return assistDoctor;
	690	+ }
	691	+
	692	+ public void setAssistDoctor(String assistDoctor) {
	693	+ this.assistDoctor = assistDoctor;
	694	+ }
	695	+
	696	+ public String getAssistSign() {
	697	+ return assistSign;
	698	+ }
	699	+
	700	+ public void setAssistSign(String assistSign) {
	701	+ this.assistSign = assistSign;
	702	+ }
	703	+
	704	+ public String getAssistHospitalId() {
	705	+ return assistHospitalId;
	706	+ }
	707	+
	708	+ public void setAssistHospitalId(String assistHospitalId) {
	709	+ this.assistHospitalId = assistHospitalId;
	710	+ }
	711	+
540	712	/************************************************************************/
	713	+
	714	+
541	715
542	716	public String getLhHiv() {
543	717	return lhHiv;

...	...	@@ -263,15 +263,45 @@
263	263	checkupResult.setCxNum(result.getCxNum());
264	264	checkupResult.setId(result.getId());
265	265	checkupResult.setParentId(result.getId());
	266	+
	267	+ checkupResult.setBaseTime(DateUtil.getyyyy_MM_dd(result.getBaseTime()));
	268	+ checkupResult.setPhysiqueTime(DateUtil.getyyyy_MM_dd(result.getPhysiqueTime()));
	269	+ checkupResult.setRepTime(DateUtil.getyyyy_MM_dd(result.getRepTime()));
	270	+ checkupResult.setClinicTime(DateUtil.getyyyy_MM_dd(result.getClinicTime()));
	271	+ checkupResult.setAssistTime(DateUtil.getyyyy_MM_dd(result.getAssistTime()));
266	272	checkupResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
	273	+
	274	+ checkupResult.setBaseDoctor(result.getBaseDoctor());
	275	+ checkupResult.setPhysiqueDoctor(result.getPhysiqueDoctor());
	276	+ checkupResult.setRepDoctor(result.getRepDoctor());
	277	+ checkupResult.setClinicDoctor(result.getClinicDoctor());
	278	+ checkupResult.setAssistDoctor(result.getAssistDoctor());
	279	+ checkupResult.setHunJianDoctor(result.getHunJianDoctor());
	280	+
	281	+ checkupResult.setBaseSign(result.getBaseSign());
	282	+ checkupResult.setPhysiqueSign(result.getPhysiqueSign());
	283	+ checkupResult.setRepSign(result.getRepSign());
	284	+ checkupResult.setClinicSign(result.getClinicSign());
	285	+ checkupResult.setAssistSign(result.getAssistSign());
	286	+ checkupResult.setGuidSign(result.getGuidSign());
	287	+
	288	+ checkupResult.setUserSign(result.getUserSign());
	289	+
	290	+ checkupResult.setBaseHospitalId(result.getBaseHospitalId());
	291	+ checkupResult.setPhysiqueHospitalId(result.getPhysiqueHospitalId());
	292	+ checkupResult.setRepHospitalId(result.getRepHospitalId());
	293	+ checkupResult.setClinicHospitalId(result.getClinicHospitalId());
	294	+ checkupResult.setAssistHospitalId(result.getAssistHospitalId());
	295	+ checkupResult.setHospitalId(result.getHospitalId());
	296	+
267	297	checkupResult.setPublishId(result.getPublishId());
268	298	//查询的时候,返回医院的名称
269		- if (result.getHospitalId() != null) {
270		- Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
271		- if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
272		- checkupResult.setHospitalId(organization.getName());
273		- }
274		- }
	299	+// if (result.getHospitalId() != null) {
	300	+// Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
	301	+// if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	302	+// checkupResult.setHospitalId(organization.getName());
	303	+// }
	304	+// }
275	305	checkupResult.setCertificateNum(result.getCertificateNum());
276	306	checkupResult.setCertificateTypeId(result.getCertificateTypeId());
277	307	checkupResult.setVcCardNo(result.getVcCardNo());
...	...	@@ -452,7 +482,7 @@
452	482	hunJianDoctor = users.getName();
453	483	}
454	484	}*/
455		- checkupResult.setHunJianDoctor(result.getHunJianDoctor());
	485	+
456	486	// checkupResult.setHunJianDoctor(hunJianDoctor);
457	487
458	488	//新增字段赋值
...	...	@@ -488,12 +518,6 @@
488	518	checkupResult.setYuyan(result.getYuyan());
489	519	checkupResult.setSeJue(result.getSeJue());
490	520
491		-
492		- checkupResult.setBaseSign(result.getBaseSign());
493		- checkupResult.setPhysiqueSign(result.getPhysiqueSign());
494		- checkupResult.setRepSign(result.getRepSign());
495		- checkupResult.setGuidSign(result.getGuidSign());
496		- checkupResult.setUserSign(result.getUserSign());
497	521	checkupResult.setJczt(result.getJczt());
498	522	checkupResult.setFkjjState(result.getFkjjState());
499	523	checkupResult.setNumCode(com.lyms.platform.common.utils.StringUtils.numCodeStr(result.getNumCode()));
...	...	@@ -944,8 +968,6 @@
944	968	checkup.setYiXueYiJian(addRequest.getYiXueYiJian());
945	969	checkup.setYiJianQiTaDetails(addRequest.getYiJianQiTaDetails());
946	970	checkup.setZhiDaoYiJian(addRequest.getZhiDaoYiJian());
947		- checkup.setHunJianDoctor(addRequest.getHunJianDoctor());
948		-
949	971	checkup.setMailNo(addRequest.getMailNo());
950	972	checkup.setShiliRight(addRequest.getShiliRight());
951	973	checkup.setShiliLeft(addRequest.getShiliLeft());
952	974
953	975
954	976
...	...	@@ -954,11 +976,34 @@
954	976	checkup.setYuyan(addRequest.getYuyan());
955	977	checkup.setSeJue(addRequest.getSeJue());
956	978
	979	+ checkup.setBaseTime(DateUtil.parseYMD(addRequest.getBaseTime()));
	980	+ checkup.setPhysiqueTime(DateUtil.parseYMD(addRequest.getPhysiqueTime()));
	981	+ checkup.setRepTime(DateUtil.parseYMD(addRequest.getRepTime()));
	982	+ checkup.setClinicTime(DateUtil.parseYMD(addRequest.getClinicTime()));
	983	+ checkup.setAssistTime(DateUtil.parseYMD(addRequest.getAssistTime()));
	984	+ checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime()));
957	985
	986	+ checkup.setBaseDoctor(addRequest.getBaseDoctor());
	987	+ checkup.setPhysiqueDoctor(addRequest.getPhysiqueDoctor());
	988	+ checkup.setRepDoctor(addRequest.getRepDoctor());
	989	+ checkup.setClinicDoctor(addRequest.getClinicDoctor());
	990	+ checkup.setAssistDoctor(addRequest.getAssistDoctor());
	991	+ checkup.setHunJianDoctor(addRequest.getHunJianDoctor());
	992	+
958	993	checkup.setBaseSign(addRequest.getBaseSign());
959	994	checkup.setPhysiqueSign(addRequest.getPhysiqueSign());
960	995	checkup.setRepSign(addRequest.getRepSign());
	996	+ checkup.setClinicSign(addRequest.getClinicSign());
	997	+ checkup.setAssistSign(addRequest.getAssistSign());
961	998	checkup.setGuidSign(addRequest.getGuidSign());
	999	+
	1000	+ checkup.setBaseHospitalId(addRequest.getBaseHospitalId());
	1001	+ checkup.setPhysiqueHospitalId(addRequest.getPhysiqueHospitalId());
	1002	+ checkup.setRepHospitalId(addRequest.getRepHospitalId());
	1003	+ checkup.setClinicHospitalId(addRequest.getClinicHospitalId());
	1004	+ checkup.setAssistHospitalId(addRequest.getAssistHospitalId());
	1005	+ checkup.setHospitalId(addRequest.getHospitalId());
	1006	+
962	1007	checkup.setUserSign(addRequest.getUserSign());
963	1008
964	1009	/**隆化-增加 X线摄影报告
...	...	@@ -973,7 +1018,6 @@
973	1018	checkup.setModified(new Date());
974	1019	checkup.setVcCardNo(addRequest.getVcCardNo());
975	1020	checkup.setCertificateNum(addRequest.getCertificateNum());
976		- checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime()));
977	1021	checkup.setIsSync(1);
978	1022	if (StringUtils.isNotEmpty(addRequest.getId())) {
979	1023	//修改
...	...	@@ -986,7 +1030,6 @@
986	1030	checkup.setParentId(model.getId());
987	1031	checkup.setPublishId(userId);
988	1032	checkup.setCreated(new Date());
989		- checkup.setHospitalId(addRequest.getHospitalId());
990	1033	setNumCode(checkup);
991	1034	PremaritalCheckup premaritalCheckup = premaritalCheckupService.addPremaritalCheckup(checkup);
992	1035	id = premaritalCheckup.getId();
993	1036
994	1037
...	...	@@ -1869,12 +1912,114 @@
1869	1912	//复制
1870	1913	BeanUtils.copy(result, checkupResult);
1871	1914	checkupResult.setCxNum(result.getCxNum());
	1915	+
	1916	+ checkupResult.setBaseTime(DateUtil.getyyyy_MM_dd(result.getBaseTime()));
	1917	+ checkupResult.setPhysiqueTime(DateUtil.getyyyy_MM_dd(result.getPhysiqueTime()));
	1918	+ checkupResult.setRepTime(DateUtil.getyyyy_MM_dd(result.getRepTime()));
	1919	+ checkupResult.setClinicTime(DateUtil.getyyyy_MM_dd(result.getClinicTime()));
	1920	+ checkupResult.setAssistTime(DateUtil.getyyyy_MM_dd(result.getAssistTime()));
	1921	+ checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
	1922	+
	1923	+ String baseDoctor = "";
	1924	+ if (result.getBaseDoctor() != null) {
	1925	+ Users users = usersService.getUsers(Integer.parseInt(result.getBaseDoctor()));
	1926	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1927	+ baseDoctor = users.getName();
	1928	+ }
	1929	+ }
	1930	+ checkupResult.setBaseDoctor(baseDoctor);
	1931	+
	1932	+ String physiqueDoctor = "";
	1933	+ if (result.getPhysiqueDoctor() != null) {
	1934	+ Users users = usersService.getUsers(Integer.parseInt(result.getPhysiqueDoctor()));
	1935	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1936	+ physiqueDoctor = users.getName();
	1937	+ }
	1938	+ }
	1939	+ checkupResult.setPhysiqueDoctor(physiqueDoctor);
	1940	+
	1941	+ String repDoctor = "";
	1942	+ if (result.getRepDoctor() != null) {
	1943	+ Users users = usersService.getUsers(Integer.parseInt(result.getRepDoctor()));
	1944	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1945	+ repDoctor = users.getName();
	1946	+ }
	1947	+ }
	1948	+ checkupResult.setRepDoctor(repDoctor);
	1949	+
	1950	+ String clinicDoctor = "";
	1951	+ if (result.getClinicDoctor() != null) {
	1952	+ Users users = usersService.getUsers(Integer.parseInt(result.getClinicDoctor()));
	1953	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1954	+ clinicDoctor = users.getName();
	1955	+ }
	1956	+ }
	1957	+ checkupResult.setClinicDoctor(clinicDoctor);
	1958	+
	1959	+ String assistDoctor = "";
	1960	+ if (result.getAssistDoctor() != null) {
	1961	+ Users users = usersService.getUsers(Integer.parseInt(result.getAssistDoctor()));
	1962	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1963	+ assistDoctor = users.getName();
	1964	+ }
	1965	+ }
	1966	+ checkupResult.setAssistDoctor(assistDoctor);
	1967	+
	1968	+ String hunJianDoctor = "";
	1969	+ if (result.getHunJianDoctor() != null) {
	1970	+ Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor()));
	1971	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	1972	+ hunJianDoctor = users.getName();
	1973	+ }
	1974	+ }
	1975	+ checkupResult.setHunJianDoctor(hunJianDoctor);
	1976	+
1872	1977	checkupResult.setBaseSign(result.getBaseSign());
1873	1978	checkupResult.setPhysiqueSign(result.getPhysiqueSign());
1874	1979	checkupResult.setRepSign(result.getRepSign());
	1980	+ checkupResult.setClinicSign(result.getClinicSign());
	1981	+ checkupResult.setAssistSign(result.getAssistSign());
1875	1982	checkupResult.setGuidSign(result.getGuidSign());
1876	1983	checkupResult.setUserSign(result.getUserSign());
1877	1984
	1985	+ //查询的时候,返回医院的名称
	1986	+ if (result.getBaseHospitalId() != null) {
	1987	+ Organization organization = organizationService.getOrganization(Integer.valueOf(result.getBaseHospitalId()));
	1988	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	1989	+ checkupResult.setBaseHospitalId(organization.getName());
	1990	+ }
	1991	+ }
	1992	+ if (result.getPhysiqueHospitalId() != null) {
	1993	+ Organization organization = organizationService.getOrganization(Integer.valueOf(result.getPhysiqueHospitalId()));
	1994	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	1995	+ checkupResult.setPhysiqueHospitalId(organization.getName());
	1996	+ }
	1997	+ }
	1998	+ if (result.getRepHospitalId() != null) {
	1999	+ Organization organization = organizationService.getOrganization(Integer.valueOf(result.getRepHospitalId()));
	2000	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	2001	+ checkupResult.setRepHospitalId(organization.getName());
	2002	+ }
	2003	+ }
	2004	+ if (result.getClinicHospitalId() != null) {
	2005	+ Organization organization = organizationService.getOrganization(Integer.valueOf(result.getClinicHospitalId()));
	2006	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	2007	+ checkupResult.setClinicHospitalId(organization.getName());
	2008	+ }
	2009	+ }
	2010	+ if (result.getAssistHospitalId() != null) {
	2011	+ Organization organization = organizationService.getOrganization(Integer.valueOf(result.getAssistHospitalId()));
	2012	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	2013	+ checkupResult.setAssistHospitalId(organization.getName());
	2014	+ }
	2015	+ }
	2016	+ if (result.getHospitalId() != null) {
	2017	+ Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
	2018	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	2019	+ checkupResult.setHunJianHospital(organization.getName());
	2020	+ }
	2021	+ }
	2022	+
1878	2023	checkupResult.setUsername(archiveModel.getUsername());
1879	2024	checkupResult.setSex(getBaseicConfigByid(archiveModel.getSex()));
1880	2025	checkupResult.setBirthday(DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()));
1881	2026
...	...	@@ -1905,24 +2050,7 @@
1905	2050	checkupResult.setIsBloodshed(result.getIsBloodshed());
1906	2051	checkupResult.setBloodshed(result.getBloodshed());
1907	2052
1908		- checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
1909		- String hunJianDoctor = "";
1910		- if (result.getHunJianDoctor() != null) {
1911		- Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor()));
1912		- if (users != null && users.getYn() == YnEnums.YES.getId()) {
1913		- hunJianDoctor = users.getName();
1914		- }
1915		- }
1916		- checkupResult.setHunJianDoctor(hunJianDoctor);
1917		- //checkupResult.setHunJianDoctor(result.getHunJianDoctor());
1918	2053
1919		- //查询的时候,返回医院的名称
1920		- if (result.getHospitalId() != null) {
1921		- Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
1922		- if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
1923		- checkupResult.setHunJianHospital(organization.getName());
1924		- }
1925		- }
1926	2054
1927	2055	checkupResult.setMenarcheAge(UnitHandle(result.getMenarcheAge(), UnitConstants.SUI));
1928	2056	if (result.getMenstrualCycle() != null && !"/".equals(result.getMenstrualCycle())) {

...	...	@@ -21,10 +21,6 @@
21	21	private String id;
22	22	//女性/男性ID
23	23	private String parentId;
24		- //婚检时间
25		- private String premaritalUpTime;
26		- //医院ID
27		- private String hospitalId;
28	24	//证件号
29	25	private String certificateNum;
30	26	//证件类型Id
31	27
...	...	@@ -407,15 +403,14 @@
407	403	private String yiJianQiTaDetails;
408	404	//指导意见
409	405	private String zhiDaoYiJian;
410		- //婚检医生
411		- private String hunJianDoctor;
	406	+
412	407	//转诊医院
413	408	private String referralHospital;
414	409	//转诊日期
415	410	private String referralDate;
416	411	//出具证明时间
417	412	private String issueTime;
418		- //主检医师签名
	413	+ //主检医师签名（系统没有用）
419	414	private String doctorSign;
420	415
421	416	private Integer sexType;
422	417
423	418
424	419
425	420
426	421
427	422
428	423
...	...	@@ -435,17 +430,60 @@
435	430	//色觉
436	431	private String seJue;
437	432
438		- //婚检信息签名
	433	+
	434	+ //婚检信息时间（婚检信息配套）
	435	+ private String baseTime;
	436	+ //婚检信息医生（婚检信息配套）
	437	+ private String baseDoctor;
	438	+ //婚检信息医生签名（婚检信息配套）
439	439	private String baseSign;
	440	+ //婚检查医院（婚检信息配套）
	441	+ private String baseHospitalId;
440	442
441		- //体格检查签名
	443	+ //体格检查时间（体格检查配套）
	444	+ private String physiqueTime;
	445	+ //体格检查医生（体格检查配套）
	446	+ private String physiqueDoctor;
	447	+ //体格检查签名（体格检查配套）
442	448	private String physiqueSign;
	449	+ //体格检查医院（体格检查配套）
	450	+ private String physiqueHospitalId;
443	451
444		- //生殖检查签名
	452	+ //生殖检查时间（生殖检查配套）
	453	+ private String repTime;
	454	+ //生殖检查医生（生殖检查配套）
	455	+ private String repDoctor;
	456	+ //生殖检查签名（生殖检查配套）
445	457	private String repSign;
	458	+ //生殖检查医院（生殖检查配套）
	459	+ private String repHospitalId;
446	460
447		- //婚前指导签名
	461	+ //临床检查时间（临床检查配套）
	462	+ private String clinicTime;
	463	+ //临床检查医生（临床检查配套）
	464	+ private String clinicDoctor;
	465	+ //临床检查签名（临床检查配套）
	466	+ private String clinicSign;
	467	+ //临床检查医院（临床检查配套）
	468	+ private String clinicHospitalId;
	469	+
	470	+ //辅助检查时间（辅助检查配套）
	471	+ private String assistTime;
	472	+ //辅助检查医生（辅助检查配套）
	473	+ private String assistDoctor;
	474	+ //辅助检查签名（辅助检查配套）
	475	+ private String assistSign;
	476	+ //辅助检查医院（辅助检查配套）
	477	+ private String assistHospitalId;
	478	+
	479	+ //婚检时间（婚前指导配套）
	480	+ private String premaritalUpTime;
	481	+ //婚前指导医生（婚前指导配套）
	482	+ private String hunJianDoctor;
	483	+ //婚前指导签名（婚前指导配套）
448	484	private String guidSign;
	485	+ //医院ID（婚前指导配套）
	486	+ private String hospitalId;
449	487
450	488	//用户签名
451	489	private String userSign;
452	490
...	...	@@ -526,7 +564,144 @@
526	564	//胺臭味试验26
527	565	private String acwsy;
528	566
	567	+ public String getBaseTime() {
	568	+ return baseTime;
	569	+ }
	570	+
	571	+ public void setBaseTime(String baseTime) {
	572	+ this.baseTime = baseTime;
	573	+ }
	574	+
	575	+ public String getBaseDoctor() {
	576	+ return baseDoctor;
	577	+ }
	578	+
	579	+ public void setBaseDoctor(String baseDoctor) {
	580	+ this.baseDoctor = baseDoctor;
	581	+ }
	582	+
	583	+ public String getBaseHospitalId() {
	584	+ return baseHospitalId;
	585	+ }
	586	+
	587	+ public void setBaseHospitalId(String baseHospitalId) {
	588	+ this.baseHospitalId = baseHospitalId;
	589	+ }
	590	+
	591	+ public String getPhysiqueTime() {
	592	+ return physiqueTime;
	593	+ }
	594	+
	595	+ public void setPhysiqueTime(String physiqueTime) {
	596	+ this.physiqueTime = physiqueTime;
	597	+ }
	598	+
	599	+ public String getPhysiqueDoctor() {
	600	+ return physiqueDoctor;
	601	+ }
	602	+
	603	+ public void setPhysiqueDoctor(String physiqueDoctor) {
	604	+ this.physiqueDoctor = physiqueDoctor;
	605	+ }
	606	+
	607	+ public String getPhysiqueHospitalId() {
	608	+ return physiqueHospitalId;
	609	+ }
	610	+
	611	+ public void setPhysiqueHospitalId(String physiqueHospitalId) {
	612	+ this.physiqueHospitalId = physiqueHospitalId;
	613	+ }
	614	+
	615	+ public String getRepTime() {
	616	+ return repTime;
	617	+ }
	618	+
	619	+ public void setRepTime(String repTime) {
	620	+ this.repTime = repTime;
	621	+ }
	622	+
	623	+ public String getRepDoctor() {
	624	+ return repDoctor;
	625	+ }
	626	+
	627	+ public void setRepDoctor(String repDoctor) {
	628	+ this.repDoctor = repDoctor;
	629	+ }
	630	+
	631	+ public String getRepHospitalId() {
	632	+ return repHospitalId;
	633	+ }
	634	+
	635	+ public void setRepHospitalId(String repHospitalId) {
	636	+ this.repHospitalId = repHospitalId;
	637	+ }
	638	+
	639	+ public String getClinicTime() {
	640	+ return clinicTime;
	641	+ }
	642	+
	643	+ public void setClinicTime(String clinicTime) {
	644	+ this.clinicTime = clinicTime;
	645	+ }
	646	+
	647	+ public String getClinicDoctor() {
	648	+ return clinicDoctor;
	649	+ }
	650	+
	651	+ public void setClinicDoctor(String clinicDoctor) {
	652	+ this.clinicDoctor = clinicDoctor;
	653	+ }
	654	+
	655	+ public String getClinicSign() {
	656	+ return clinicSign;
	657	+ }
	658	+
	659	+ public void setClinicSign(String clinicSign) {
	660	+ this.clinicSign = clinicSign;
	661	+ }
	662	+
	663	+ public String getClinicHospitalId() {
	664	+ return clinicHospitalId;
	665	+ }
	666	+
	667	+ public void setClinicHospitalId(String clinicHospitalId) {
	668	+ this.clinicHospitalId = clinicHospitalId;
	669	+ }
	670	+
	671	+ public String getAssistTime() {
	672	+ return assistTime;
	673	+ }
	674	+
	675	+ public void setAssistTime(String assistTime) {
	676	+ this.assistTime = assistTime;
	677	+ }
	678	+
	679	+ public String getAssistDoctor() {
	680	+ return assistDoctor;
	681	+ }
	682	+
	683	+ public void setAssistDoctor(String assistDoctor) {
	684	+ this.assistDoctor = assistDoctor;
	685	+ }
	686	+
	687	+ public String getAssistSign() {
	688	+ return assistSign;
	689	+ }
	690	+
	691	+ public void setAssistSign(String assistSign) {
	692	+ this.assistSign = assistSign;
	693	+ }
	694	+
	695	+ public String getAssistHospitalId() {
	696	+ return assistHospitalId;
	697	+ }
	698	+
	699	+ public void setAssistHospitalId(String assistHospitalId) {
	700	+ this.assistHospitalId = assistHospitalId;
	701	+ }
	702	+
529	703	/************************************************************************/
	704	+
530	705
531	706	public String getWbc() {
532	707	return wbc;

...	...	@@ -9,18 +9,6 @@
9	9	public class PremaritalCheckupPageResult {
10	10
11	11
12		- //婚检信息签名
13		- private String baseSign;
14		-
15		- //体格检查签名
16		- private String physiqueSign;
17		-
18		- //生殖检查签名
19		- private String repSign;
20		-
21		- //婚前指导签名
22		- private String guidSign;
23		-
24	12	//用户签名
25	13	private String userSign;
26	14	// private String id;
27	15
28	16
...	...	@@ -75,19 +63,8 @@
75	63
76	64	/**婚检信息 */
77	65
78		- //婚检日期
79		- private String hunJianDate;
80	66
81		- //婚检医生
82		- private String hunJianDoctor;
83	67
84		- //婚检医院
85		- private String hunJianHospital;
86		-
87		-
88		-
89		-
90		-
91	68	/**************** 婚育史 ******************/
92	69	/* 女性 */
93	70	//初潮年龄
94	71
...	...	@@ -489,8 +466,198 @@
489	466	private String lqj;
490	467	//胺臭味试验26
491	468	private String acwsy;
	469	+ /*****************************************/
	470	+ //婚检信息时间（婚检信息配套）
	471	+ private String baseTime;
	472	+ //婚检信息医生（婚检信息配套）
	473	+ private String baseDoctor;
	474	+ //婚检信息医生签名（婚检信息配套）
	475	+ private String baseSign;
	476	+ //婚检查医院（婚检信息配套）
	477	+ private String baseHospitalId;
492	478
493		- /************************************************************************/
	479	+ //体格检查时间（体格检查配套）
	480	+ private String physiqueTime;
	481	+ //体格检查医生（体格检查配套）
	482	+ private String physiqueDoctor;
	483	+ //体格检查签名（体格检查配套）
	484	+ private String physiqueSign;
	485	+ //体格检查医院（体格检查配套）
	486	+ private String physiqueHospitalId;
	487	+
	488	+ //生殖检查时间（生殖检查配套）
	489	+ private String repTime;
	490	+ //生殖检查医生（生殖检查配套）
	491	+ private String repDoctor;
	492	+ //生殖检查签名（生殖检查配套）
	493	+ private String repSign;
	494	+ //生殖检查医院（生殖检查配套）
	495	+ private String repHospitalId;
	496	+
	497	+ //临床检查时间（临床检查配套）
	498	+ private String clinicTime;
	499	+ //临床检查医生（临床检查配套）
	500	+ private String clinicDoctor;
	501	+ //临床检查签名（临床检查配套）
	502	+ private String clinicSign;
	503	+ //临床检查医院（临床检查配套）
	504	+ private String clinicHospitalId;
	505	+
	506	+ //辅助检查时间（辅助检查配套）
	507	+ private String assistTime;
	508	+ //辅助检查医生（辅助检查配套）
	509	+ private String assistDoctor;
	510	+ //辅助检查签名（辅助检查配套）
	511	+ private String assistSign;
	512	+ //辅助检查医院（辅助检查配套）
	513	+ private String assistHospitalId;
	514	+
	515	+ //婚检日期（婚前指导配套）
	516	+ private String hunJianDate;
	517	+ //婚前指导医生（婚前指导配套）
	518	+ private String hunJianDoctor;
	519	+ //婚前指导签名（婚前指导配套）
	520	+ private String guidSign;
	521	+ //婚检医院（婚前指导配套）
	522	+ private String hunJianHospital;
	523	+
	524	+/************************************************************************/
	525	+
	526	+ public String getBaseTime() {
	527	+ return baseTime;
	528	+ }
	529	+
	530	+ public void setBaseTime(String baseTime) {
	531	+ this.baseTime = baseTime;
	532	+ }
	533	+
	534	+ public String getBaseDoctor() {
	535	+ return baseDoctor;
	536	+ }
	537	+
	538	+ public void setBaseDoctor(String baseDoctor) {
	539	+ this.baseDoctor = baseDoctor;
	540	+ }
	541	+
	542	+ public String getBaseHospitalId() {
	543	+ return baseHospitalId;
	544	+ }
	545	+
	546	+ public void setBaseHospitalId(String baseHospitalId) {
	547	+ this.baseHospitalId = baseHospitalId;
	548	+ }
	549	+
	550	+ public String getPhysiqueTime() {
	551	+ return physiqueTime;
	552	+ }
	553	+
	554	+ public void setPhysiqueTime(String physiqueTime) {
	555	+ this.physiqueTime = physiqueTime;
	556	+ }
	557	+
	558	+ public String getPhysiqueDoctor() {
	559	+ return physiqueDoctor;
	560	+ }
	561	+
	562	+ public void setPhysiqueDoctor(String physiqueDoctor) {
	563	+ this.physiqueDoctor = physiqueDoctor;
	564	+ }
	565	+
	566	+ public String getPhysiqueHospitalId() {
	567	+ return physiqueHospitalId;
	568	+ }
	569	+
	570	+ public void setPhysiqueHospitalId(String physiqueHospitalId) {
	571	+ this.physiqueHospitalId = physiqueHospitalId;
	572	+ }
	573	+
	574	+ public String getRepTime() {
	575	+ return repTime;
	576	+ }
	577	+
	578	+ public void setRepTime(String repTime) {
	579	+ this.repTime = repTime;
	580	+ }
	581	+
	582	+ public String getRepDoctor() {
	583	+ return repDoctor;
	584	+ }
	585	+
	586	+ public void setRepDoctor(String repDoctor) {
	587	+ this.repDoctor = repDoctor;
	588	+ }
	589	+
	590	+ public String getRepHospitalId() {
	591	+ return repHospitalId;
	592	+ }
	593	+
	594	+ public void setRepHospitalId(String repHospitalId) {
	595	+ this.repHospitalId = repHospitalId;
	596	+ }
	597	+
	598	+ public String getClinicTime() {
	599	+ return clinicTime;
	600	+ }
	601	+
	602	+ public void setClinicTime(String clinicTime) {
	603	+ this.clinicTime = clinicTime;
	604	+ }
	605	+
	606	+ public String getClinicDoctor() {
	607	+ return clinicDoctor;
	608	+ }
	609	+
	610	+ public void setClinicDoctor(String clinicDoctor) {
	611	+ this.clinicDoctor = clinicDoctor;
	612	+ }
	613	+
	614	+ public String getClinicSign() {
	615	+ return clinicSign;
	616	+ }
	617	+
	618	+ public void setClinicSign(String clinicSign) {
	619	+ this.clinicSign = clinicSign;
	620	+ }
	621	+
	622	+ public String getClinicHospitalId() {
	623	+ return clinicHospitalId;
	624	+ }
	625	+
	626	+ public void setClinicHospitalId(String clinicHospitalId) {
	627	+ this.clinicHospitalId = clinicHospitalId;
	628	+ }
	629	+
	630	+ public String getAssistTime() {
	631	+ return assistTime;
	632	+ }
	633	+
	634	+ public void setAssistTime(String assistTime) {
	635	+ this.assistTime = assistTime;
	636	+ }
	637	+
	638	+ public String getAssistDoctor() {
	639	+ return assistDoctor;
	640	+ }
	641	+
	642	+ public void setAssistDoctor(String assistDoctor) {
	643	+ this.assistDoctor = assistDoctor;
	644	+ }
	645	+
	646	+ public String getAssistSign() {
	647	+ return assistSign;
	648	+ }
	649	+
	650	+ public void setAssistSign(String assistSign) {
	651	+ this.assistSign = assistSign;
	652	+ }
	653	+
	654	+ public String getAssistHospitalId() {
	655	+ return assistHospitalId;
	656	+ }
	657	+
	658	+ public void setAssistHospitalId(String assistHospitalId) {
	659	+ this.assistHospitalId = assistHospitalId;
	660	+ }
494	661
495	662	public String getWbc() {
496	663	return wbc;

...	...	@@ -13,10 +13,7 @@
13	13	private String id;
14	14	//女性/男性ID
15	15	private String parentId;
16		- //婚检时间
17		- private String premaritalUpTime;
18		- //医院ID
19		- private String hospitalId;
	16	+
20	17	//操作人
21	18	private Integer publishId;
22	19	//证件号
...	...	@@ -343,8 +340,7 @@
343	340	private String yiJianQiTaDetails;
344	341	//指导意见
345	342	private String zhiDaoYiJian;
346		- //婚检医生
347		- private String hunJianDoctor;
	343	+
348	344	//婚前卫生咨询
349	345	private String hunqianHealth;
350	346	//咨询指导结果
351	347
352	348
353	349
...	...	@@ -405,18 +401,9 @@
405	401
406	402	//色觉
407	403	private String seJue;
408		- //婚检信息签名
409		- private String baseSign;
410	404
411		- //体格检查签名
412		- private String physiqueSign;
413	405
414		- //生殖检查签名
415		- private String repSign;
416	406
417		- //婚前指导签名
418		- private String guidSign;
419		-
420	407	//用户签名
421	408	private String userSign;
422	409
423	410
424	411
...	...	@@ -500,8 +487,200 @@
500	487	private String lqj;
501	488	//胺臭味试验26
502	489	private String acwsy;
	490	+ /*****************************************/
	491	+ //婚检信息时间（婚检信息配套）
	492	+ private String baseTime;
	493	+ //婚检信息医生（婚检信息配套）
	494	+ private String baseDoctor;
	495	+ //婚检信息医生签名（婚检信息配套）
	496	+ private String baseSign;
	497	+ //婚检查医院（婚检信息配套）
	498	+ private String baseHospitalId;
503	499
	500	+ //体格检查时间（体格检查配套）
	501	+ private String physiqueTime;
	502	+ //体格检查医生（体格检查配套）
	503	+ private String physiqueDoctor;
	504	+ //体格检查签名（体格检查配套）
	505	+ private String physiqueSign;
	506	+ //体格检查医院（体格检查配套）
	507	+ private String physiqueHospitalId;
	508	+
	509	+ //生殖检查时间（生殖检查配套）
	510	+ private String repTime;
	511	+ //生殖检查医生（生殖检查配套）
	512	+ private String repDoctor;
	513	+ //生殖检查签名（生殖检查配套）
	514	+ private String repSign;
	515	+ //生殖检查医院（生殖检查配套）
	516	+ private String repHospitalId;
	517	+
	518	+ //临床检查时间（临床检查配套）
	519	+ private String clinicTime;
	520	+ //临床检查医生（临床检查配套）
	521	+ private String clinicDoctor;
	522	+ //临床检查签名（临床检查配套）
	523	+ private String clinicSign;
	524	+ //临床检查医院（临床检查配套）
	525	+ private String clinicHospitalId;
	526	+
	527	+ //辅助检查时间（辅助检查配套）
	528	+ private String assistTime;
	529	+ //辅助检查医生（辅助检查配套）
	530	+ private String assistDoctor;
	531	+ //辅助检查签名（辅助检查配套）
	532	+ private String assistSign;
	533	+ //辅助检查医院（辅助检查配套）
	534	+ private String assistHospitalId;
	535	+
	536	+ //婚检时间（婚前指导配套）
	537	+ private String premaritalUpTime;
	538	+ //婚前指导医生（婚前指导配套）
	539	+ private String hunJianDoctor;
	540	+ //婚前指导签名（婚前指导配套）
	541	+ private String guidSign;
	542	+ //医院ID（婚前指导配套）
	543	+ private String hospitalId;
	544	+
	545	+ public String getBaseTime() {
	546	+ return baseTime;
	547	+ }
	548	+
	549	+ public void setBaseTime(String baseTime) {
	550	+ this.baseTime = baseTime;
	551	+ }
	552	+
	553	+ public String getBaseDoctor() {
	554	+ return baseDoctor;
	555	+ }
	556	+
	557	+ public void setBaseDoctor(String baseDoctor) {
	558	+ this.baseDoctor = baseDoctor;
	559	+ }
	560	+
	561	+ public String getBaseHospitalId() {
	562	+ return baseHospitalId;
	563	+ }
	564	+
	565	+ public void setBaseHospitalId(String baseHospitalId) {
	566	+ this.baseHospitalId = baseHospitalId;
	567	+ }
	568	+
	569	+ public String getPhysiqueTime() {
	570	+ return physiqueTime;
	571	+ }
	572	+
	573	+ public void setPhysiqueTime(String physiqueTime) {
	574	+ this.physiqueTime = physiqueTime;
	575	+ }
	576	+
	577	+ public String getPhysiqueDoctor() {
	578	+ return physiqueDoctor;
	579	+ }
	580	+
	581	+ public void setPhysiqueDoctor(String physiqueDoctor) {
	582	+ this.physiqueDoctor = physiqueDoctor;
	583	+ }
	584	+
	585	+ public String getPhysiqueHospitalId() {
	586	+ return physiqueHospitalId;
	587	+ }
	588	+
	589	+ public void setPhysiqueHospitalId(String physiqueHospitalId) {
	590	+ this.physiqueHospitalId = physiqueHospitalId;
	591	+ }
	592	+
	593	+ public String getRepTime() {
	594	+ return repTime;
	595	+ }
	596	+
	597	+ public void setRepTime(String repTime) {
	598	+ this.repTime = repTime;
	599	+ }
	600	+
	601	+ public String getRepDoctor() {
	602	+ return repDoctor;
	603	+ }
	604	+
	605	+ public void setRepDoctor(String repDoctor) {
	606	+ this.repDoctor = repDoctor;
	607	+ }
	608	+
	609	+ public String getRepHospitalId() {
	610	+ return repHospitalId;
	611	+ }
	612	+
	613	+ public void setRepHospitalId(String repHospitalId) {
	614	+ this.repHospitalId = repHospitalId;
	615	+ }
	616	+
	617	+ public String getClinicTime() {
	618	+ return clinicTime;
	619	+ }
	620	+
	621	+ public void setClinicTime(String clinicTime) {
	622	+ this.clinicTime = clinicTime;
	623	+ }
	624	+
	625	+ public String getClinicDoctor() {
	626	+ return clinicDoctor;
	627	+ }
	628	+
	629	+ public void setClinicDoctor(String clinicDoctor) {
	630	+ this.clinicDoctor = clinicDoctor;
	631	+ }
	632	+
	633	+ public String getClinicSign() {
	634	+ return clinicSign;
	635	+ }
	636	+
	637	+ public void setClinicSign(String clinicSign) {
	638	+ this.clinicSign = clinicSign;
	639	+ }
	640	+
	641	+ public String getClinicHospitalId() {
	642	+ return clinicHospitalId;
	643	+ }
	644	+
	645	+ public void setClinicHospitalId(String clinicHospitalId) {
	646	+ this.clinicHospitalId = clinicHospitalId;
	647	+ }
	648	+
	649	+ public String getAssistTime() {
	650	+ return assistTime;
	651	+ }
	652	+
	653	+ public void setAssistTime(String assistTime) {
	654	+ this.assistTime = assistTime;
	655	+ }
	656	+
	657	+ public String getAssistDoctor() {
	658	+ return assistDoctor;
	659	+ }
	660	+
	661	+ public void setAssistDoctor(String assistDoctor) {
	662	+ this.assistDoctor = assistDoctor;
	663	+ }
	664	+
	665	+ public String getAssistSign() {
	666	+ return assistSign;
	667	+ }
	668	+
	669	+ public void setAssistSign(String assistSign) {
	670	+ this.assistSign = assistSign;
	671	+ }
	672	+
	673	+ public String getAssistHospitalId() {
	674	+ return assistHospitalId;
	675	+ }
	676	+
	677	+ public void setAssistHospitalId(String assistHospitalId) {
	678	+ this.assistHospitalId = assistHospitalId;
	679	+ }
	680	+
504	681	/************************************************************************/
	682	+
	683	+
505	684	public String getLhHiv() {
506	685	return lhHiv;
507	686	}