Commit 11a0d7e238e723e564b08352d7dfaf9762a1d9e2
1 parent
8ba637084e
Exists in
master
and in
7 other branches
修改产检删除
Showing 1 changed file with 22 additions and 2 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
View file @
11a0d7e
... | ... | @@ -210,6 +210,8 @@ |
210 | 210 | antExRecordModel.setCheckTime(antEx.getCheckDate()); |
211 | 211 | antExRecordModel.setPid(antEx.getPid()); |
212 | 212 | antExRecordModel.setModified(new Date()); |
213 | + antExRecordModel.setBarCode(antEx.getBarCode()); | |
214 | + antExRecordModel.setNextCheckTime(antEx.getNextCheckTime()); | |
213 | 215 | Patients patients = patientsService.findOnePatientById(antEx.getParentId()); |
214 | 216 | if (null != patients) { |
215 | 217 | if (patients.getType() == 1) { |
... | ... | @@ -217,6 +219,14 @@ |
217 | 219 | } else { |
218 | 220 | antExRecordModel.setStatus(1); |
219 | 221 | } |
222 | + antExRecordModel.setAddressRegister(patients.getAddressRegister()); | |
223 | + antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId()); | |
224 | + antExRecordModel.setCityRegisterId(patients.getCityRegisterId()); | |
225 | + antExRecordModel.setAreaRegisterId(patients.getAreaRegisterId()); | |
226 | + antExRecordModel.setStreetRegisterId(patients.getStreetRegisterId()); | |
227 | + antExRecordModel.setBuildDoctor(patients.getBookbuildingDoctor()); | |
228 | + antExRecordModel.setDueDate(patients.getDueDate()); | |
229 | + antExRecordModel.setPhone(patients.getPhone()); | |
220 | 230 | antExRecordModel.setBrith(patients.getBirth()); |
221 | 231 | antExRecordModel.setBuildTime(patients.getBookbuildingDate()); |
222 | 232 | antExRecordModel.setLastMenses(patients.getLastMenses()); |
... | ... | @@ -241,6 +251,8 @@ |
241 | 251 | antExRecordModel.setfId(antExChuModel.getId()); |
242 | 252 | antExRecordModel.setPid(antExChuModel.getPid()); |
243 | 253 | antExRecordModel.setModified(new Date()); |
254 | + antExRecordModel.setBarCode(antExChuModel.getBarCode()); | |
255 | + antExRecordModel.setNextCheckTime(antExChuModel.getNextCheckTime()); | |
244 | 256 | Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); |
245 | 257 | if (null != patients) { |
246 | 258 | if (patients.getType() == 1) { |
247 | 259 | |
248 | 260 | |
... | ... | @@ -248,10 +260,18 @@ |
248 | 260 | } else { |
249 | 261 | antExRecordModel.setStatus(1); |
250 | 262 | } |
251 | - antExRecordModel.setLastMenses(patients.getLastMenses()); | |
252 | - antExRecordModel.setBuildTime(patients.getBookbuildingDate()); | |
263 | + antExRecordModel.setAddressRegister(patients.getAddressRegister()); | |
264 | + antExRecordModel.setProvinceRegisterId(patients.getProvinceRegisterId()); | |
265 | + antExRecordModel.setCityRegisterId(patients.getCityRegisterId()); | |
266 | + antExRecordModel.setAreaRegisterId(patients.getAreaRegisterId()); | |
267 | + antExRecordModel.setStreetRegisterId(patients.getStreetRegisterId()); | |
268 | + antExRecordModel.setBuildDoctor(patients.getBookbuildingDoctor()); | |
253 | 269 | antExRecordModel.setDueDate(patients.getDueDate()); |
270 | + antExRecordModel.setPhone(patients.getPhone()); | |
254 | 271 | antExRecordModel.setBrith(patients.getBirth()); |
272 | + antExRecordModel.setBuildTime(patients.getBookbuildingDate()); | |
273 | + antExRecordModel.setLastMenses(patients.getLastMenses()); | |
274 | + antExRecordModel.setDueDate(patients.getDueDate()); | |
255 | 275 | antExRecordModel.setName(patients.getUsername()); |
256 | 276 | antExRecordModel.sethScore(patients.getRiskScore()); |
257 | 277 | antExRecordModel.sethRisk(patients.getRiskFactorId()); |