Commit 501623e2207a3cccfeca64fb53f6e7135267c73c
1 parent
3978019cf7
Exists in
master
and in
8 other branches
commit
Showing 1 changed file with 26 additions and 16 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
View file @
501623e
| ... | ... | @@ -35,6 +35,8 @@ |
| 35 | 35 | private ISieveApplyOrderDao sieveApplyOrderDao; |
| 36 | 36 | @Autowired |
| 37 | 37 | private IReferralApplyOrderDao iReferralApplyOrderDao; |
| 38 | + @Autowired | |
| 39 | + private PersonService personService; | |
| 38 | 40 | |
| 39 | 41 | public Patients addPatient(Patients obj) { |
| 40 | 42 | return iPatientDao.addPatient(obj); |
| ... | ... | @@ -62,7 +64,7 @@ |
| 62 | 64 | return iPatientDao.queryPatient(mongoQuery); |
| 63 | 65 | } |
| 64 | 66 | |
| 65 | - public List<Patients> queryPatient1(PatientsQuery patientsQuery,String field) { | |
| 67 | + public List<Patients> queryPatient1(PatientsQuery patientsQuery, String field) { | |
| 66 | 68 | MongoQuery query = patientsQuery.convertToQuery(); |
| 67 | 69 | if (StringUtils.isNotEmpty(patientsQuery.getNeed())) { |
| 68 | 70 | patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query)); |
| 69 | 71 | |
| ... | ... | @@ -191,12 +193,22 @@ |
| 191 | 193 | patientsQuery.setType(1); |
| 192 | 194 | patientsQuery.setLastMensesEnd(endDate); |
| 193 | 195 | List<Patients> patientses = queryPatient(patientsQuery); |
| 196 | + List<PersonModel> list = null; | |
| 194 | 197 | for (Patients patients : patientses) { |
| 195 | 198 | patients.setType(3); |
| 196 | 199 | patients.setBuildType(2); |
| 197 | 200 | patients.setFmDate(DateUtil.addDay(patients.getLastMenses(), 293)); |
| 198 | 201 | patients.setModified(new Date()); |
| 199 | 202 | updatePatient(patients); |
| 203 | + PersonModelQuery personYunModelQuery = new PersonModelQuery(); | |
| 204 | + personYunModelQuery.setYn(YnEnums.YES.getId()); | |
| 205 | + personYunModelQuery.setId(patients.getId()); | |
| 206 | + list = personService.queryPersons(personYunModelQuery); | |
| 207 | + if (CollectionUtils.isNotEmpty(list)) { | |
| 208 | + PersonModel pm = list.get(0); | |
| 209 | + pm.setType(3);//基本信息更新成产妇 | |
| 210 | + personService.updatePerson(pm, pm.getId()); | |
| 211 | + } | |
| 200 | 212 | } |
| 201 | 213 | } |
| 202 | 214 | |
| 203 | 215 | |
| ... | ... | @@ -213,13 +225,12 @@ |
| 213 | 225 | } |
| 214 | 226 | |
| 215 | 227 | |
| 216 | - | |
| 217 | 228 | /** |
| 218 | 229 | * 修改产筛数据 |
| 219 | 230 | * |
| 220 | 231 | * @param patients |
| 221 | 232 | */ |
| 222 | - public void updateSieve(Patients patients){ | |
| 233 | + public void updateSieve(Patients patients) { | |
| 223 | 234 | if (null != patients && null != patients.getLastMenses()) { |
| 224 | 235 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |
| 225 | 236 | //判断是否在区间 |
| ... | ... | @@ -239,7 +250,7 @@ |
| 239 | 250 | sieveModel.setName(patients.getUsername()); |
| 240 | 251 | sieveModel.setLastMenses(patients.getLastMenses()); |
| 241 | 252 | sieveModel.setCardNo(patients.getCardNo()); |
| 242 | - if(null!= sieveModel.getDueWeek()){ | |
| 253 | + if (null != sieveModel.getDueWeek()) { | |
| 243 | 254 | sieveModel.setDueWeek(days); |
| 244 | 255 | } |
| 245 | 256 | sieveDao.updateChanQianSieve(sieveModel); |
| ... | ... | @@ -269,7 +280,7 @@ |
| 269 | 280 | sieveModel.setName(patients.getUsername()); |
| 270 | 281 | sieveModel.setLastMenses(patients.getLastMenses()); |
| 271 | 282 | sieveModel.setCardNo(patients.getCardNo()); |
| 272 | - if(null!= sieveModel.getDueWeek()) { | |
| 283 | + if (null != sieveModel.getDueWeek()) { | |
| 273 | 284 | sieveModel.setDueWeek(days); |
| 274 | 285 | } |
| 275 | 286 | sieveDao.updateChanQianSieve(sieveModel); |
| 276 | 287 | |
| ... | ... | @@ -280,14 +291,13 @@ |
| 280 | 291 | } |
| 281 | 292 | |
| 282 | 293 | |
| 283 | - | |
| 284 | - public void updateRefer(BabyModel babyModel){ | |
| 285 | - ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); | |
| 294 | + public void updateRefer(BabyModel babyModel) { | |
| 295 | + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); | |
| 286 | 296 | referralApplyOrderQuery.setParentId(babyModel.getId()); |
| 287 | 297 | referralApplyOrderQuery.setHospitalId(babyModel.getHospitalId()); |
| 288 | - List<ReferralApplyOrderModel> referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); | |
| 289 | - if(CollectionUtils.isNotEmpty(referralApplyOrderModel)) { | |
| 290 | - Patients patients=findOnePatientById(babyModel.getParentId()); | |
| 298 | + List<ReferralApplyOrderModel> referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); | |
| 299 | + if (CollectionUtils.isNotEmpty(referralApplyOrderModel)) { | |
| 300 | + Patients patients = findOnePatientById(babyModel.getParentId()); | |
| 291 | 301 | for (ReferralApplyOrderModel referralApplyOrderModel1 : referralApplyOrderModel) { |
| 292 | 302 | referralApplyOrderModel1.setBirth(babyModel.getBirth()); |
| 293 | 303 | referralApplyOrderModel1.setName(babyModel.getName()); |
| 294 | 304 | |
| ... | ... | @@ -306,13 +316,13 @@ |
| 306 | 316 | * |
| 307 | 317 | * @param patients |
| 308 | 318 | */ |
| 309 | - public void updateRefer(Patients patients){ | |
| 310 | - ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); | |
| 319 | + public void updateRefer(Patients patients) { | |
| 320 | + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); | |
| 311 | 321 | referralApplyOrderQuery.setParentId(patients.getId()); |
| 312 | 322 | referralApplyOrderQuery.setHospitalId(patients.getHospitalId()); |
| 313 | - List<ReferralApplyOrderModel> referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); | |
| 314 | - if(CollectionUtils.isNotEmpty(referralApplyOrderModel)){ | |
| 315 | - for(ReferralApplyOrderModel referralApplyOrderModel1:referralApplyOrderModel){ | |
| 323 | + List<ReferralApplyOrderModel> referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); | |
| 324 | + if (CollectionUtils.isNotEmpty(referralApplyOrderModel)) { | |
| 325 | + for (ReferralApplyOrderModel referralApplyOrderModel1 : referralApplyOrderModel) { | |
| 316 | 326 | referralApplyOrderModel1.setBirth(patients.getBirth()); |
| 317 | 327 | referralApplyOrderModel1.setLastMenses(patients.getLastMenses()); |
| 318 | 328 | referralApplyOrderModel1.setName(patients.getUsername()); |