jiangjiazhi / regional-platform

Commit d94a6726638f59666b8e1ff0c5aa35e9cc2cc745

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 28 additions and 28 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java

...	...	@@ -15,6 +15,7 @@
15	15	* 儿童口腔检查
16	16	*
17	17	* @author Administrator
	18	+ * 口腔模块增加必要的筛选字段看情况同步到儿童档案
18	19	*/
19	20	@Document(collection = "lyms_baby_oral_check")
20	21	public class BabyOralCheck extends BaseModel {

...	...	@@ -24,6 +24,7 @@
24	24	/**
25	25	* 儿童口腔接口
26	26	* Created by Administrator on 2022/3/11.
	27	+ * 口腔模块增加必要的筛选字段看情况同步到儿童档案
27	28	*/
28	29
29	30	@Controller

...	...	@@ -110,24 +110,23 @@
110	110	//修改最新的记录才会同步儿童档案，新增也会同步到儿童档案
111	111	if( (CollectionUtils.isNotEmpty(babyOralChecks) && babyOralChecks.get(0).getId().equals(babyOralCheck.getId())) \|\|
112	112	StringUtils.isEmpty(babyOralCheck.getId())){
113		- BabyModel babyModel2 = new BabyModel();
	113	+ Update update = new Update();
114	114	if(StringUtils.isEmpty(babyOralCheck.getId())){
115		- babyModel2.setOralCheckId(add.getId());
116		- babyModel2.setOralCheckYn(babyOralCheck.getYn());
	115	+ update.set("oralCheckId",add.getId());
	116	+ update.set("oralCheckYn",babyOralCheck.getYn());
117	117	}else{
118		- babyModel2.setOralCheckId(babyOralCheck.getId());
	118	+ update.set("oralCheckId",babyOralCheck.getId());
119	119	}
120		- babyModel2.setPositiveType(babyOralCheck.getPositiveType());
121		- babyModel2.setOralCheckTime(babyOralCheck.getOralCheckTime());
122		- babyModel2.setNextOralCheckTime(babyOralCheck.getNextOralCheckTime());
123		- babyModel2.setOralCheckDoctor(babyOralCheck.getOralCheckDoctor());
124		- babyModel2.setOralHighRisk(babyOralCheck.getOralHighRisk());
125		- babyModel2.setOralCheckMonthId(babyOralCheck.getCheckMonthId());
126		- babyModel2.setQc(babyOralCheck.getQc());
127		- babyModel2.setHc(babyOralCheck.getHc());
128		- babyModel2.setWgfb(babyOralCheck.getWgfb());
129		- babyModel2.setOralCheckMonthAge(babyOralCheck.getCheckMonthAge());
130		- Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyModel2));
	120	+ update.set("positiveType",babyOralCheck.getPositiveType() );
	121	+ update.set("oralCheckTime",babyOralCheck.getOralCheckTime() );
	122	+ update.set("nextOralCheckTime",babyOralCheck.getNextOralCheckTime() );
	123	+ update.set("oralCheckDoctor",babyOralCheck.getOralCheckDoctor() );
	124	+ update.set("oralHighRisk",babyOralCheck.getOralHighRisk() );
	125	+ update.set("oralCheckMonthId",babyOralCheck.getCheckMonthId() );
	126	+ update.set("qc",babyOralCheck.getQc() );
	127	+ update.set("hc",babyOralCheck.getHc() );
	128	+ update.set("wgfb",babyOralCheck.getWgfb() );
	129	+ update.set("oralCheckMonthAge",babyOralCheck.getCheckMonthAge() );
131	130	mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyOralCheck.getBabyId())), update, BabyModel.class);
132	131	}
133	132
134	133
135	134
136	135
...	...	@@ -149,24 +148,23 @@
149	148	checkQuery.setYn(YnEnums.YES.getId());
150	149	checkQuery.setBabyId(oralCheck.getBabyId());
151	150	List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,"created");
152		- BabyModel babyModel = new BabyModel();
	151	+ Update update = new Update();
153	152	//删除唯一的检查记录
154	153	if( CollectionUtils.isEmpty(babyOralChecks)){
155		- babyModel.setOralCheckYn(YnEnums.NO.getId());
	154	+ update.set("yn", YnEnums.NO.getId());
156	155	}else {//儿童档案数据同步为删除后最后一条
157	156	BabyOralCheck babyOralCheck=babyOralChecks.get(0);
158		- babyModel.setPositiveType(babyOralCheck.getPositiveType());
159		- babyModel.setOralCheckTime(babyOralCheck.getOralCheckTime());
160		- babyModel.setNextOralCheckTime(babyOralCheck.getNextOralCheckTime());
161		- babyModel.setOralCheckDoctor(babyOralCheck.getOralCheckDoctor());
162		- babyModel.setOralHighRisk(babyOralCheck.getOralHighRisk());
163		- babyModel.setOralCheckMonthId(babyOralCheck.getCheckMonthId());
164		- babyModel.setQc(babyOralCheck.getQc());
165		- babyModel.setHc(babyOralCheck.getHc());
166		- babyModel.setWgfb(babyOralCheck.getWgfb());
167		- babyModel.setOralCheckMonthAge(babyOralCheck.getCheckMonthAge());
	157	+ update.set("positiveType",babyOralCheck.getPositiveType() );
	158	+ update.set("oralCheckTime",babyOralCheck.getOralCheckTime() );
	159	+ update.set("nextOralCheckTime",babyOralCheck.getNextOralCheckTime() );
	160	+ update.set("oralCheckDoctor",babyOralCheck.getOralCheckDoctor() );
	161	+ update.set("oralHighRisk",babyOralCheck.getOralHighRisk() );
	162	+ update.set("oralCheckMonthId",babyOralCheck.getCheckMonthId() );
	163	+ update.set("qc",babyOralCheck.getQc() );
	164	+ update.set("hc",babyOralCheck.getHc() );
	165	+ update.set("wgfb",babyOralCheck.getWgfb() );
	166	+ update.set("oralCheckMonthAge",babyOralCheck.getCheckMonthAge() );
168	167	}
169		- Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyModel));
170	168	mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(oralCheck.getBabyId())), update, BabyModel.class);
171	169	}
172	170	BaseObjectResponse br = new BaseObjectResponse();