jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 8 changed files with 74 additions and 9 deletions

...	...	@@ -4,7 +4,6 @@
4	4	import com.lyms.platform.common.result.BaseModel;
5	5	import org.springframework.data.mongodb.core.mapping.Document;
6	6
7		-import java.io.Serializable;
8	7	import java.util.Date;
9	8	import java.util.List;
10	9
...	...	@@ -102,6 +101,18 @@
102	101	private Integer abortionZR;
103	102	//人工流产
104	103	private Integer abortionRG;
	104	+ /**
	105	+ * 其他的诊断意见
	106	+ */
	107	+ private String diagnosisOther;
	108	+
	109	+ public String getDiagnosisOther() {
	110	+ return diagnosisOther;
	111	+ }
	112	+
	113	+ public void setDiagnosisOther(String diagnosisOther) {
	114	+ this.diagnosisOther = diagnosisOther;
	115	+ }
105	116
106	117	public String getBarCode() {
107	118	return barCode;

...	...	@@ -6,7 +6,6 @@
6	6
7	7	import java.util.Date;
8	8	import java.util.List;
9		-import java.util.Map;
10	9
11	10	/**
12	11	* 产前检查
...	...	@@ -84,6 +83,10 @@
84	83	private String typeYc;
85	84	//处理意见
86	85	private String treatmentOpinion;
	86	+ /**
	87	+ * 其他的诊断意见
	88	+ */
	89	+ private String diagnosisOther;
87	90	//指导
88	91	private String guide;
89	92	//产检医生
...	...	@@ -99,6 +102,14 @@
99	102	private String cDueWeek;
100	103	//操作人
101	104	private Integer operator;
	105	+
	106	+ public String getDiagnosisOther() {
	107	+ return diagnosisOther;
	108	+ }
	109	+
	110	+ public void setDiagnosisOther(String diagnosisOther) {
	111	+ this.diagnosisOther = diagnosisOther;
	112	+ }
102	113
103	114	public String getBarCode() {
104	115	return barCode;

...	...	@@ -238,7 +238,6 @@
238	238
239	239
240	240	if (StringUtils.isNotEmpty(antExAddRequest.getId())) {
241		-
242	241	model.setHospitalId(hospitalId);
243	242	model.setOperator(userId);
244	243	antenatalExaminationService.updateOneAnt(model, antExAddRequest.getId());
...	...	@@ -266,7 +265,6 @@
266	265	//复诊,修改产检管理
267	266	antenatalExaminationService.updateAntExRecord(antExAddRequest.getId(), 2);
268	267	} else {
269		-
270	268	model.setOperator(userId);
271	269	model.setYn(YnEnums.YES.getId());
272	270	model.setHospitalId(hospitalId);

...	...	@@ -21,7 +21,6 @@
21	21	import com.lyms.platform.permission.model.Users;
22	22	import com.lyms.platform.permission.service.OrganizationService;
23	23	import com.lyms.platform.permission.service.UsersService;
24		-import com.lyms.platform.pojo.BasicConfig;
25	24	import com.lyms.platform.pojo.PremaritalCheckup;
26	25	import com.lyms.platform.pojo.ResidentsArchiveModel;
27	26	import com.lyms.platform.pojo.SmsConfigModel;
...	...	@@ -494,7 +493,25 @@
494	493	result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class));
495	494
496	495	result.setVcCardNo(model.getVcCardNo());
497		- result.setBuildDoctor(model.getBuildDoctor());
	496	+ if (StringUtils.isNotEmpty( model.getBuildDoctor())){
	497	+ Users u = usersService.getUsers(Integer.valueOf(model.getBuildDoctor()));
	498	+ if(u!=null){
	499	+ Map<String,String> doctInfo = new HashMap<>();
	500	+ doctInfo.put("id",String.valueOf(u.getId()));
	501	+ doctInfo.put("name",u.getName());
	502	+ result.setBuildDoctor(doctInfo);
	503	+ }else{
	504	+ Map<String,String> doctInfo = new HashMap<>();
	505	+ doctInfo.put("id",String.valueOf(u.getId()));
	506	+ result.setBuildDoctor(doctInfo);
	507	+ }
	508	+ }else{
	509	+ Map<String,String> doctInfo = new HashMap<>();
	510	+ doctInfo.put("id",String.valueOf(model.getBuildDoctor()));
	511	+ result.setBuildDoctor(doctInfo);
	512	+ }
	513	+
	514	+
498	515	result.setBuildDay(DateUtil.getyyyy_MM_dd(model.getBuildDay()));
499	516
500	517	result.setCreated(model.getCreated());

...	...	@@ -279,6 +279,7 @@
279	279	/* 基本信息 */
280	280	//孕妇基本信息
281	281	map.put("id",data.getId());
	282	+ map.put("diagnosisOther",data.getDiagnosisOther());
282	283	map.put("username",patients.getUsername());
283	284	map.put("birth", DateUtil.getyyyy_MM_dd(patients.getBirth()));
284	285	map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
...	...	@@ -637,6 +638,7 @@
637	638	/* 基本信息 */
638	639	//孕妇基本信息
639	640	map.put("id",data.getId());
	641	+ map.put("diagnosisOther",data.getDiagnosisOther());
640	642	map.put("username",patients.getUsername());
641	643	map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
642	644	map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI));

...	...	@@ -19,6 +19,10 @@
19	19	private String id;
20	20
21	21	private String barCode;
	22	+ /**
	23	+ * 其他的诊断意见
	24	+ */
	25	+ private String diagnosisOther;
22	26
23	27	public String getBarCode() {
24	28	return barCode;
...	...	@@ -90,6 +94,14 @@
90	94
91	95	private Integer couponType;
92	96
	97	+ public String getDiagnosisOther() {
	98	+ return diagnosisOther;
	99	+ }
	100	+
	101	+ public void setDiagnosisOther(String diagnosisOther) {
	102	+ this.diagnosisOther = diagnosisOther;
	103	+ }
	104	+
93	105	public String getCouponCode() {
94	106	return couponCode;
95	107	}
...	...	@@ -138,6 +150,7 @@
138	150	public AntenatalExaminationModel convertToDataModel() {
139	151	AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
140	152	examinationModel.setId(id);
	153	+ examinationModel.setDiagnosisOther(diagnosisOther);
141	154	examinationModel.setBarCode(barCode);
142	155	examinationModel.setParentId(parentId);
143	156	examinationModel.setCurrentDueDate(currentDueDate);

...	...	@@ -206,7 +206,19 @@
206	206	private String couponCode;
207	207
208	208	private Integer couponType;
	209	+ /**
	210	+ * 其他的诊断意见
	211	+ */
	212	+ private String diagnosisOther;
209	213
	214	+ public String getDiagnosisOther() {
	215	+ return diagnosisOther;
	216	+ }
	217	+
	218	+ public void setDiagnosisOther(String diagnosisOther) {
	219	+ this.diagnosisOther = diagnosisOther;
	220	+ }
	221	+
210	222	public String getCouponCode() {
211	223	return couponCode;
212	224	}
...	...	@@ -903,6 +915,7 @@
903	915	@Override
904	916	public AntExChuModel convertToDataModel() {
905	917	AntExChuModel antExChuModel=new AntExChuModel();
	918	+ antExChuModel.setDiagnosisOther(diagnosisOther);
906	919	antExChuModel.setBg(bg);
907	920	antExChuModel.setBarCode(barCode);
908	921	antExChuModel.setId(id);

...	...	@@ -78,7 +78,7 @@
78	78	//就诊卡号
79	79	private String vcCardNo;
80	80	//建档人
81		- private String buildDoctor;
	81	+ private Map<String,String> buildDoctor;
82	82	//建档日期
83	83	private String buildDay;
84	84
85	85
...	...	@@ -347,11 +347,11 @@
347	347	this.vcCardNo = vcCardNo;
348	348	}
349	349
350		- public String getBuildDoctor() {
	350	+ public Map<String,String> getBuildDoctor() {
351	351	return buildDoctor;
352	352	}
353	353
354		- public void setBuildDoctor(String buildDoctor) {
	354	+ public void setBuildDoctor(Map<String,String> buildDoctor) {
355	355	this.buildDoctor = buildDoctor;
356	356	}
357	357