jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

1 parent 62620083e4

Exists in master and in 6 other branches

Showing 6 changed files with 57 additions and 2 deletions

...	...	@@ -548,6 +548,7 @@
548	548	/*尿常规检查*/
549	549	//葡萄糖12
550	550	private String glu;
	551	+ private String gluOther;
551	552	/*血型*/
552	553	//Rh血型13
553	554	private String rh;
...	...	@@ -590,6 +591,14 @@
590	591	private String lhbcms;
591	592	//B超检查号
592	593	private String lhbcjch;
	594	+
	595	+ public String getGluOther() {
	596	+ return gluOther;
	597	+ }
	598	+
	599	+ public void setGluOther(String gluOther) {
	600	+ this.gluOther = gluOther;
	601	+ }
593	602
594	603	public String getMenstrualDay() {
595	604	return menstrualDay;

...	...	@@ -739,7 +739,7 @@
739	739
740	740	if (StringUtils.isEmpty(premaritalCheckup.getAssistDoctor()))
741	741	{
742		- premaritalCheckup.setAssistDoctor("2100002225");//修素英
	742	+ premaritalCheckup.setAssistDoctor("2100006234");//张洪英
743	743	premaritalCheckup.setAssistHospitalId("2100001605");
744	744	premaritalCheckup.setAssistTime(model.getCheckTime());
745	745	}

...	...	@@ -730,6 +730,7 @@
730	730	checkup.setJczt(addRequest.getJczt());
731	731	checkup.setFkjjState(addRequest.getFkjjState());
732	732	checkup.setMenstrualDay(addRequest.getMenstrualDay());
	733	+ checkup.setGluOther(addRequest.getGluOther());
733	734	//血缘关系
734	735	checkup.setIsBloodshed(addRequest.getIsBloodshed());
735	736	//血缘详情

...	...	@@ -539,6 +539,7 @@
539	539	/*尿常规检查*/
540	540	//葡萄糖12
541	541	private String glu;
	542	+ private String gluOther;
542	543	/*血型*/
543	544	//Rh血型13
544	545	private String rh;
...	...	@@ -581,6 +582,13 @@
581	582	//B超检查号
582	583	private String lhbcjch;
583	584
	585	+ public String getGluOther() {
	586	+ return gluOther;
	587	+ }
	588	+
	589	+ public void setGluOther(String gluOther) {
	590	+ this.gluOther = gluOther;
	591	+ }
584	592
585	593	public String getMenstrualDay() {
586	594	return menstrualDay;

...	...	@@ -535,6 +535,25 @@
535	535	private String lhbcms;
536	536	//B超检查号
537	537	private String lhbcjch;
	538	+ //月经天数
	539	+ private String menstrualDay;
	540	+ private String gluOther;
	541	+
	542	+ public String getMenstrualDay() {
	543	+ return menstrualDay;
	544	+ }
	545	+
	546	+ public void setMenstrualDay(String menstrualDay) {
	547	+ this.menstrualDay = menstrualDay;
	548	+ }
	549	+
	550	+ public String getGluOther() {
	551	+ return gluOther;
	552	+ }
	553	+
	554	+ public void setGluOther(String gluOther) {
	555	+ this.gluOther = gluOther;
	556	+ }
538	557
539	558	public String getLhbcms() {
540	559	return lhbcms;

...	...	@@ -51,9 +51,11 @@
51	51	private String lastMenses;
52	52	//痛经(1:有 2:无) （1:无 2:轻 3:中 4:重）
53	53	private Integer menorrhalgia;
	54	+ //月经天数
	55	+ private String menstrualDay;
54	56	//人流
55	57	private Integer renLiu;
56		-
	58	+ private String gluOther;
57	59	/* 男性只有这三种 */
58	60	//既往婚育史(1: 有 2: 无)
59	61	private Integer maritalHistory;
...	...	@@ -557,6 +559,22 @@
557	559	private String lhbcms;
558	560	//B超检查号
559	561	private String lhbcjch;
	562	+
	563	+ public String getMenstrualDay() {
	564	+ return menstrualDay;
	565	+ }
	566	+
	567	+ public void setMenstrualDay(String menstrualDay) {
	568	+ this.menstrualDay = menstrualDay;
	569	+ }
	570	+
	571	+ public String getGluOther() {
	572	+ return gluOther;
	573	+ }
	574	+
	575	+ public void setGluOther(String gluOther) {
	576	+ this.gluOther = gluOther;
	577	+ }
560	578
561	579	public String getLhbcms() {
562	580	return lhbcms;