jiangjiazhi / regional-platform

Commit cda5136abdfd661668e80d2053a7669fbb266818

Authored by liquanyu almost 5 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 118 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java

...	...	@@ -121,6 +121,7 @@
121	121	private Map<String,Object> rxlHddz;
122	122	//活动度右
123	123	private Map<String,Object> rxlHddy;
	124	+
124	125	//副乳1.无2.有
125	126	private String rxlFr;
126	127	// 遵化新增，副乳其它
...	...	@@ -135,6 +136,14 @@
135	136	private Map<String,Object> rxlSglby;
136	137	//临床检査结果
137	138	private Map<String,Object> rxlJcjg;
	139	+
	140	+ //临床检查机构
	141	+ private String lcjcjg;
	142	+ //临床检査人员
	143	+ private String lcjcry;
	144	+ //临床检査日期
	145	+ private Date lcjcrq;
	146	+
138	147	//遵化新增，治疗情况
139	148	private String zlqk;
140	149
...	...	@@ -207,6 +216,42 @@
207	216
208	217	//1 未同步 2已经同步
209	218	private Integer isSync;
	219	+
	220	+
	221	+ //编号
	222	+ private String code;
	223	+
	224	+ public String getLcjcjg() {
	225	+ return lcjcjg;
	226	+ }
	227	+
	228	+ public void setLcjcjg(String lcjcjg) {
	229	+ this.lcjcjg = lcjcjg;
	230	+ }
	231	+
	232	+ public String getLcjcry() {
	233	+ return lcjcry;
	234	+ }
	235	+
	236	+ public void setLcjcry(String lcjcry) {
	237	+ this.lcjcry = lcjcry;
	238	+ }
	239	+
	240	+ public Date getLcjcrq() {
	241	+ return lcjcrq;
	242	+ }
	243	+
	244	+ public void setLcjcrq(Date lcjcrq) {
	245	+ this.lcjcrq = lcjcrq;
	246	+ }
	247	+
	248	+ public String getCode() {
	249	+ return code;
	250	+ }
	251	+
	252	+ public void setCode(String code) {
	253	+ this.code = code;
	254	+ }
210	255
211	256	public Integer getIsSync() {
212	257	return isSync;

...	...	@@ -11,6 +11,7 @@
11	11	import com.lyms.platform.common.result.RespBuilder;
12	12	import com.lyms.platform.common.utils.*;
13	13	import com.lyms.platform.operate.web.request.CancerScreeningRequest;
	14	+import com.lyms.platform.operate.web.result.CancerScreeningResult;
14	15	import com.lyms.platform.operate.web.utils.CommonsHelper;
15	16	import com.lyms.platform.operate.web.utils.FunvCommonUtil;
16	17	import com.lyms.platform.operate.web.utils.ResponseUtil;
...	...	@@ -27,6 +28,7 @@
27	28	import org.apache.commons.collections.CollectionUtils;
28	29	import org.apache.commons.collections.map.HashedMap;
29	30	import org.apache.commons.lang.StringUtils;
	31	+import org.springframework.beans.*;
30	32	import org.springframework.beans.factory.annotation.Autowired;
31	33	import org.springframework.stereotype.Component;
32	34
...	...	@@ -295,6 +297,15 @@
295	297	public BaseResponse getCancerScreenInfo(String id) {
296	298	BaseResponse baseResponse = new BaseResponse();
297	299	CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id);
	300	+ CancerScreeningResult result = new CancerScreeningResult();
	301	+ org.springframework.beans.BeanUtils.copyProperties(cancerScreeningModel,result);
	302	+
	303	+ result.setNationStr(CommonsHelper.getName1(cancerScreeningModel.getNationId(),basicConfigService));
	304	+ result.setLevelTypeStr(CommonsHelper.getName1(cancerScreeningModel.getLevelTypeId(),basicConfigService));
	305	+ String addressStr = CommonsHelper.getResidence(cancerScreeningModel.getProvinceId(), cancerScreeningModel.getCityId(),
	306	+ cancerScreeningModel.getAreaId(), cancerScreeningModel.getStreetId(), cancerScreeningModel.getAddress(), basicConfigService);
	307	+ result.setAddressStr(addressStr);
	308	+
298	309	baseResponse.setObject(cancerScreeningModel);
299	310	return baseResponse;
300	311	}

	1	+package com.lyms.platform.operate.web.result;
	2	+
	3	+import com.lyms.platform.pojo.CancerScreeningModel;
	4	+
	5	+/**
	6	+ * Created by Administrator on 2021-07-19.
	7	+ */
	8	+public class CancerScreeningResult extends CancerScreeningModel {
	9	+
	10	+ private String nationStr;
	11	+
	12	+ private String levelTypeStr;
	13	+
	14	+ private String addressStr;
	15	+
	16	+ public String getNationStr() {
	17	+ return nationStr;
	18	+ }
	19	+
	20	+ public void setNationStr(String nationStr) {
	21	+ this.nationStr = nationStr;
	22	+ }
	23	+
	24	+ public String getLevelTypeStr() {
	25	+ return levelTypeStr;
	26	+ }
	27	+
	28	+ public void setLevelTypeStr(String levelTypeStr) {
	29	+ this.levelTypeStr = levelTypeStr;
	30	+ }
	31	+
	32	+ public String getAddressStr() {
	33	+ return addressStr;
	34	+ }
	35	+
	36	+ public void setAddressStr(String addressStr) {
	37	+ this.addressStr = addressStr;
	38	+ }
	39	+}

...	...	@@ -18,6 +18,27 @@
18	18
19	19	private String createTime;
20	20
	21	+
	22	+ private String nationStr;
	23	+
	24	+ private String levelTypeStr;
	25	+
	26	+ public String getNationStr() {
	27	+ return nationStr;
	28	+ }
	29	+
	30	+ public void setNationStr(String nationStr) {
	31	+ this.nationStr = nationStr;
	32	+ }
	33	+
	34	+ public String getLevelTypeStr() {
	35	+ return levelTypeStr;
	36	+ }
	37	+
	38	+ public void setLevelTypeStr(String levelTypeStr) {
	39	+ this.levelTypeStr = levelTypeStr;
	40	+ }
	41	+
21	42	public String getCreateTime() {
22	43	return createTime;
23	44	}

...	...	@@ -638,6 +638,8 @@
638	638	basicConfigService
639	639	));
640	640
	641	+ result.setNationStr(CommonsHelper.getName1(model.getNationId(), basicConfigService));
	642	+ result.setLevelTypeStr(CommonsHelper.getName1(model.getLevelTypeId(), basicConfigService));
641	643	result.setLastMenstrual(model.getMcyj());
642	644	result.setName(model.getUsername());
643	645	result.setAge(model.getAge());