jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0932e1c9d88f823c31a5736b8728325b0fb2dfbc

Authored by [wangbo]
1 parent e681789737
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 2 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 0932e1c
... ... @@ -1181,12 +1181,8 @@
1181 1181 }
1182 1182 }
1183 1183 //处理孕妇建档处历史数据
1184   -
1185   -
1186 1184 patients.setHistory(true);
1187 1185 List<Patients> patientsList = patientsService.queryPatient(patients);
1188   -
1189   -
1190 1186 if (CollectionUtils.isNotEmpty(patientsList)) {
1191 1187 int batchSize = 5;
1192 1188 int ends = 0;
... ... @@ -1214,8 +1210,6 @@
1214 1210 }
1215 1211 }
1216 1212 //追访详情历史数据处理
1217   -
1218   -
1219 1213 trackDownRecordQuery.setHistory(true);
1220 1214 List<TrackDownRecord> trackDownRecords = trackDownRecordService.queryTrackDown(trackDownRecordQuery);
1221 1215 if (CollectionUtils.isNotEmpty(trackDownRecords)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 0932e1c
... ... @@ -6242,10 +6242,10 @@
6242 6242 result.setWeight(StringUtils.isNotEmpty(checkModel.getWeight()) ? checkModel.getWeight() + "kg,评价：" + checkModel.getWeightEvaluate() : "");
6243 6243 result.setHeight(StringUtils.isNotEmpty(checkModel.getHeight()) ? checkModel.getHeight() + "cm,评价：" + checkModel.getHeightEvaluate() : "");
6244 6244 result.setWeightOrHeight(checkModel.getHeightWeight());
6245   - result.setPhysiqueInfo(checkModel.getWeightEvaluate());
  6245 + result.setPhysiqueInfo(checkModel.getGrowthEvaluate());
6246 6246 result.setHeadCircumference(checkModel.getHead());
6247 6247 result.setXhdb(checkModel.getHemoglobin());
6248   - result.setOtherCheck(JsonUtil.obj2JsonString(checkModel.getFaceColor()));
  6248 + result.setOtherCheck(checkModel.getBabyCheckOther());
6249 6249 result.setCheckHospital(StringUtils.isNotEmpty(checkModel.getHospitalId()) ? organizationService.getOrganization(Integer.valueOf(checkModel.getHospitalId())).getName() : "");
6250 6250 result.setCheckDoctor(StringUtils.isNotEmpty(checkModel.getCheckDoctor()) ? usersService.getUsers(Integer.valueOf(checkModel.getCheckDoctor())).getName() : "");
6251 6251 result.setNextCheckTime(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));