changpengfei / talkonline

Commit b3d5d9a7b8848636625cf7aebd7aac0fd0ccf3b8

Authored by shiyang almost 3 years ago

Exists in master

update

Showing 5 changed files with 111 additions and 39 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsInspectionReport.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsInspectionReportMapper.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsInspectionReportService.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsInspectionReportServiceImpl.java
talkonlineweb/src/main/resources/mapper/LymsInspectionReportMapper.xml

...	...	@@ -208,12 +208,6 @@
208	208	private String gjrrtlbdjc;
209	209
210	210	/**
211		- * 乳腺癌筛查
212		- */
213		- @TableField(value = "rxasc")
214		- private String rxasc;
215		-
216		- /**
217	211	* 乳腺彩超（请输
218	212	入彩超意见）
219	213	*/
...	...	@@ -638,6 +632,54 @@
638	632	@TableField(value = "rxzyt")
639	633	private String rxzyt;
640	634
	635	+ /**
	636	+ * 主诊断
	637	+ */
	638	+ @TableField(value = "zzd")
	639	+ private String zzd;
	640	+
	641	+ /**
	642	+ * 主诊断内容
	643	+ */
	644	+ @TableField(value = "zzdnr")
	645	+ private String zzdnr;
	646	+
	647	+ /**
	648	+ * 次要诊断
	649	+ */
	650	+ @TableField(value = "cyzd")
	651	+ private String cyzd;
	652	+
	653	+ /**
	654	+ * 次诊断内容
	655	+ */
	656	+ @TableField(value = "cyzdnr")
	657	+ private String cyzdnr;
	658	+
	659	+ /**
	660	+ * 处理意见
	661	+ */
	662	+ @TableField(value = "clyj")
	663	+ private String clyj;
	664	+
	665	+ /**
	666	+ * 指导意见
	667	+ */
	668	+ @TableField(value = "zdyj")
	669	+ private String zdyj;
	670	+
	671	+ /**
	672	+ * 检查医生id
	673	+ */
	674	+ @TableField(value = "jcys")
	675	+ private Integer jcys;
	676	+
	677	+ /**
	678	+ * 预约下次检查时间
	679	+ */
	680	+ @TableField(value = "yyxcjcsj")
	681	+ private Date yyxcjcsj;
	682	+
641	683	@TableField(exist = false)
642	684	private static final long serialVersionUID = 1L;
643	685
...	...	@@ -685,7 +727,6 @@
685	727	&& (this.getBxbbd() == null ? other.getBxbbd() == null : this.getBxbbd().equals(other.getBxbbd()))
686	728	&& (this.getGjxbxjc() == null ? other.getGjxbxjc() == null : this.getGjxbxjc().equals(other.getGjxbxjc()))
687	729	&& (this.getGjrrtlbdjc() == null ? other.getGjrrtlbdjc() == null : this.getGjrrtlbdjc().equals(other.getGjrrtlbdjc()))
688		- && (this.getRxasc() == null ? other.getRxasc() == null : this.getRxasc().equals(other.getRxasc()))
689	730	&& (this.getRxcc() == null ? other.getRxcc() == null : this.getRxcc().equals(other.getRxcc()))
690	731	&& (this.getRxmb() == null ? other.getRxmb() == null : this.getRxmb().equals(other.getRxmb()))
691	732	&& (this.getBchyc() == null ? other.getBchyc() == null : this.getBchyc().equals(other.getBchyc()))
...	...	@@ -755,7 +796,15 @@
755	796	&& (this.getLzxbaky() == null ? other.getLzxbaky() == null : this.getLzxbaky().equals(other.getLzxbaky()))
756	797	&& (this.getSyyyt() == null ? other.getSyyyt() == null : this.getSyyyt().equals(other.getSyyyt()))
757	798	&& (this.getJnzyt() == null ? other.getJnzyt() == null : this.getJnzyt().equals(other.getJnzyt()))
758		- && (this.getRxzyt() == null ? other.getRxzyt() == null : this.getRxzyt().equals(other.getRxzyt()));
	799	+ && (this.getRxzyt() == null ? other.getRxzyt() == null : this.getRxzyt().equals(other.getRxzyt()))
	800	+ && (this.getZzd() == null ? other.getZzd() == null : this.getZzd().equals(other.getZzd()))
	801	+ && (this.getZzdnr() == null ? other.getZzdnr() == null : this.getZzdnr().equals(other.getZzdnr()))
	802	+ && (this.getCyzd() == null ? other.getCyzd() == null : this.getCyzd().equals(other.getCyzd()))
	803	+ && (this.getCyzdnr() == null ? other.getCyzdnr() == null : this.getCyzdnr().equals(other.getCyzdnr()))
	804	+ && (this.getClyj() == null ? other.getClyj() == null : this.getClyj().equals(other.getClyj()))
	805	+ && (this.getZdyj() == null ? other.getZdyj() == null : this.getZdyj().equals(other.getZdyj()))
	806	+ && (this.getJcys() == null ? other.getJcys() == null : this.getJcys().equals(other.getJcys()))
	807	+ && (this.getYyxcjcsj() == null ? other.getYyxcjcsj() == null : this.getYyxcjcsj().equals(other.getYyxcjcsj()));
759	808	}
760	809
761	810	@Override
...	...	@@ -794,7 +843,6 @@
794	843	result = prime * result + ((getBxbbd() == null) ? 0 : getBxbbd().hashCode());
795	844	result = prime * result + ((getGjxbxjc() == null) ? 0 : getGjxbxjc().hashCode());
796	845	result = prime * result + ((getGjrrtlbdjc() == null) ? 0 : getGjrrtlbdjc().hashCode());
797		- result = prime * result + ((getRxasc() == null) ? 0 : getRxasc().hashCode());
798	846	result = prime * result + ((getRxcc() == null) ? 0 : getRxcc().hashCode());
799	847	result = prime * result + ((getRxmb() == null) ? 0 : getRxmb().hashCode());
800	848	result = prime * result + ((getBchyc() == null) ? 0 : getBchyc().hashCode());
...	...	@@ -865,6 +913,14 @@
865	913	result = prime * result + ((getSyyyt() == null) ? 0 : getSyyyt().hashCode());
866	914	result = prime * result + ((getJnzyt() == null) ? 0 : getJnzyt().hashCode());
867	915	result = prime * result + ((getRxzyt() == null) ? 0 : getRxzyt().hashCode());
	916	+ result = prime * result + ((getZzd() == null) ? 0 : getZzd().hashCode());
	917	+ result = prime * result + ((getZzdnr() == null) ? 0 : getZzdnr().hashCode());
	918	+ result = prime * result + ((getCyzd() == null) ? 0 : getCyzd().hashCode());
	919	+ result = prime * result + ((getCyzdnr() == null) ? 0 : getCyzdnr().hashCode());
	920	+ result = prime * result + ((getClyj() == null) ? 0 : getClyj().hashCode());
	921	+ result = prime * result + ((getZdyj() == null) ? 0 : getZdyj().hashCode());
	922	+ result = prime * result + ((getJcys() == null) ? 0 : getJcys().hashCode());
	923	+ result = prime * result + ((getYyxcjcsj() == null) ? 0 : getYyxcjcsj().hashCode());
868	924	return result;
869	925	}
870	926
...	...	@@ -906,7 +962,6 @@
906	962	sb.append(", bxbbd=").append(bxbbd);
907	963	sb.append(", gjxbxjc=").append(gjxbxjc);
908	964	sb.append(", gjrrtlbdjc=").append(gjrrtlbdjc);
909		- sb.append(", rxasc=").append(rxasc);
910	965	sb.append(", rxcc=").append(rxcc);
911	966	sb.append(", rxmb=").append(rxmb);
912	967	sb.append(", bchyc=").append(bchyc);
...	...	@@ -977,6 +1032,14 @@
977	1032	sb.append(", syyyt=").append(syyyt);
978	1033	sb.append(", jnzyt=").append(jnzyt);
979	1034	sb.append(", rxzyt=").append(rxzyt);
	1035	+ sb.append(", zzd=").append(zzd);
	1036	+ sb.append(", zzdnr=").append(zzdnr);
	1037	+ sb.append(", cyzd=").append(cyzd);
	1038	+ sb.append(", cyzdnr=").append(cyzdnr);
	1039	+ sb.append(", clyj=").append(clyj);
	1040	+ sb.append(", zdyj=").append(zdyj);
	1041	+ sb.append(", jcys=").append(jcys);
	1042	+ sb.append(", yyxcjcsj=").append(yyxcjcsj);
980	1043	sb.append(", serialVersionUID=").append(serialVersionUID);
981	1044	sb.append("]");
982	1045	return sb.toString();

...	...	@@ -6,7 +6,7 @@
6	6	/**
7	7	* @author shiy
8	8	* @description 针对表【lyms_inspection_report(检查报告)】的数据库操作Mapper
9		-* @createDate 2022-07-15 16:48:20
	9	+* @createDate 2022-07-15 17:07:10
10	10	* @Entity com.lyms.talkonlineweb.domain.LymsInspectionReport
11	11	*/
12	12	public interface LymsInspectionReportMapper extends BaseMapper<LymsInspectionReport> {

...	...	@@ -6,7 +6,7 @@
6	6	/**
7	7	* @author shiy
8	8	* @description 针对表【lyms_inspection_report(检查报告)】的数据库操作Service
9		-* @createDate 2022-07-15 16:48:20
	9	+* @createDate 2022-07-15 17:07:10
10	10	*/
11	11	public interface LymsInspectionReportService extends IService<LymsInspectionReport> {
12	12

...	...	@@ -9,7 +9,7 @@
9	9	/**
10	10	* @author shiy
11	11	* @description 针对表【lyms_inspection_report(检查报告)】的数据库操作Service实现
12		-* @createDate 2022-07-15 16:48:20
	12	+* @createDate 2022-07-15 17:07:10
13	13	*/
14	14	@Service
15	15	public class LymsInspectionReportServiceImpl extends ServiceImpl<LymsInspectionReportMapper, LymsInspectionReport>

...	...	@@ -37,7 +37,6 @@
37	37	<result property="bxbbd" column="bxbbd" jdbcType="VARCHAR"/>
38	38	<result property="gjxbxjc" column="gjxbxjc" jdbcType="VARCHAR"/>
39	39	<result property="gjrrtlbdjc" column="gjrrtlbdjc" jdbcType="VARCHAR"/>
40		- <result property="rxasc" column="rxasc" jdbcType="VARCHAR"/>
41	40	<result property="rxcc" column="rxcc" jdbcType="VARCHAR"/>
42	41	<result property="rxmb" column="rxmb" jdbcType="VARCHAR"/>
43	42	<result property="bchyc" column="bchyc" jdbcType="VARCHAR"/>
...	...	@@ -108,6 +107,14 @@
108	107	<result property="syyyt" column="syyyt" jdbcType="VARCHAR"/>
109	108	<result property="jnzyt" column="jnzyt" jdbcType="VARCHAR"/>
110	109	<result property="rxzyt" column="rxzyt" jdbcType="VARCHAR"/>
	110	+ <result property="zzd" column="zzd" jdbcType="VARCHAR"/>
	111	+ <result property="zzdnr" column="zzdnr" jdbcType="VARCHAR"/>
	112	+ <result property="cyzd" column="cyzd" jdbcType="VARCHAR"/>
	113	+ <result property="cyzdnr" column="cyzdnr" jdbcType="VARCHAR"/>
	114	+ <result property="clyj" column="clyj" jdbcType="VARCHAR"/>
	115	+ <result property="zdyj" column="zdyj" jdbcType="VARCHAR"/>
	116	+ <result property="jcys" column="jcys" jdbcType="INTEGER"/>
	117	+ <result property="yyxcjcsj" column="yyxcjcsj" jdbcType="TIMESTAMP"/>
111	118	</resultMap>
112	119
113	120	<sql id="Base_Column_List">
...	...	@@ -121,31 +128,33 @@
121	128	qjdbd,gjbd,hxbbd,
122	129	spxbbd,xsxbbd,mjbd,
123	130	dcbd,asybd,bxbbd,
124		- gjxbxjc,gjrrtlbdjc,rxasc,
125		- rxcc,rxmb,bchyc,
126		- xqhcgsp,bxb,hxbjs,
127		- xhdb,xxbbr,avghxbxhdbhl,
128		- avghxbxhdbnd,hxbfbkd,xxbjs,
129		- avgxxbtj,xxbfbkd,xxbjy,
130		- lbxbbfb,zxlxbbfb,lbxbz,
131		- zxlxbz,avghxbtj,sjd,
132		- niaot,tongt,ndy,
133		- dhs,ndb,gbzam,
134		- gczam,jxlsm,gbxztm,
135		- zdhs,zjdhz,jjdhs,
136		- zdb,bdb,qdb,
137		- bqb,gcgbbz,jigan,
138		- nsa,xqgysccd,jia,
139		- na,lv,gai,
140		- glucose,niaos,nsjgqcl,
141		- sxqlglcd,wqdb,zsdjzxyas,
142		- zjzxs,yljzxs,cjzxjs,
143		- ylsdfjzxyas,zdgc,gysz,
144		- dmdzdb,zzdba,gmdzdb,
145		- zzdbb,aky,rfgdb,
146		- tlky,jtdb,apky,
147		- lzxbaky,syyyt,jnzyt,
148		- rxzyt
	131	+ gjxbxjc,gjrrtlbdjc,rxcc,
	132	+ rxmb,bchyc,xqhcgsp,
	133	+ bxb,hxbjs,xhdb,
	134	+ xxbbr,avghxbxhdbhl,avghxbxhdbnd,
	135	+ hxbfbkd,xxbjs,avgxxbtj,
	136	+ xxbfbkd,xxbjy,lbxbbfb,
	137	+ zxlxbbfb,lbxbz,zxlxbz,
	138	+ avghxbtj,sjd,niaot,
	139	+ tongt,ndy,dhs,
	140	+ ndb,gbzam,gczam,
	141	+ jxlsm,gbxztm,zdhs,
	142	+ zjdhz,jjdhs,zdb,
	143	+ bdb,qdb,bqb,
	144	+ gcgbbz,jigan,nsa,
	145	+ xqgysccd,jia,na,
	146	+ lv,gai,glucose,
	147	+ niaos,nsjgqcl,sxqlglcd,
	148	+ wqdb,zsdjzxyas,zjzxs,
	149	+ yljzxs,cjzxjs,ylsdfjzxyas,
	150	+ zdgc,gysz,dmdzdb,
	151	+ zzdba,gmdzdb,zzdbb,
	152	+ aky,rfgdb,tlky,
	153	+ jtdb,apky,lzxbaky,
	154	+ syyyt,jnzyt,rxzyt,
	155	+ zzd,zzdnr,cyzd,
	156	+ cyzdnr,clyj,zdyj,
	157	+ jcys,yyxcjcsj
149	158	</sql>
150	159	</mapper>