jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3e0c0fb731e8a50101102e3a69474dc1fb2d659c

Authored by zhangchao
1 parent 5b7537e955
Exists in dev

#fix:新增大同建档页面产检医生字段

Showing 4 changed files with 32 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 3e0c0fb
... ... @@ -1225,7 +1225,7 @@
1225 1225 }
1226 1226  
1227 1227  
1228   - if (lastCheckEmployeeId != null) {
  1228 + if (StringUtils.isNotEmpty(lastCheckEmployeeId)) {
1229 1229 condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS);
1230 1230 } else if (lastCheckEId) {
1231 1231 condition = condition.and("lastCheckEmployeeId", "", MongoOper.NE);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 3e0c0fb
... ... @@ -3324,6 +3324,7 @@
3324 3324 patientsQuery.setType(patientManagerRequest.getType());
3325 3325 patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode());
3326 3326 // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
  3327 + patientsQuery.setLastCheckEmployeeId(patientManagerRequest.getLastCheckEmployeeId());
3327 3328 List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
3328 3329 List <PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList <>();
3329 3330 if (CollectionUtils.isNotEmpty(patientsList)) {
... ... @@ -3439,6 +3440,15 @@
3439 3440 System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor());
3440 3441 }
3441 3442 }
  3443 + String lastCheckEmployeeId = "";
  3444 + if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
  3445 + Users user = usersService.getUsers(Integer.valueOf(patients.getLastCheckEmployeeId()));
  3446 + if (user != null) {
  3447 + lastCheckEmployeeId = user.getName();
  3448 + } else {
  3449 + System.out.println(patients.getId() + ";no user lastCheckEmployeeId" + patients.getLastCheckEmployeeId());
  3450 + }
  3451 + }
3442 3452 //初诊时间和初诊医生字段展示,作为模块化
3443 3453 if (StringUtils.isNotEmpty(patients.getFirstCheckId())) {
3444 3454 Users users = usersService.getUsers(Integer.parseInt(patients.getFirstCheckId()));
... ... @@ -3466,6 +3476,7 @@
3466 3476 // patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
3467 3477 // }
3468 3478 // }
  3479 + patientManagerQueryModel.setLastCheckEmployeeId(lastCheckEmployeeId);
3469 3480 patientManagerQueryModel.setBooksuifangDoctor(patients.getBooksuifangDoctor());
3470 3481 patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor);
3471 3482 patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java View file @ 3e0c0fb
... ... @@ -161,6 +161,16 @@
161 161 private String booksuifangDoctor;
162 162  
163 163 private String dept;
  164 + //产检医生
  165 + private String lastCheckEmployeeId;
  166 +
  167 + public String getLastCheckEmployeeId() {
  168 + return lastCheckEmployeeId;
  169 + }
  170 +
  171 + public void setLastCheckEmployeeId(String lastCheckEmployeeId) {
  172 + this.lastCheckEmployeeId = lastCheckEmployeeId;
  173 + }
164 174  
165 175 public String getDept() {
166 176 return dept;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java View file @ 3e0c0fb
... ... @@ -117,6 +117,8 @@
117 117  
118 118 //随访医生
119 119 private String booksuifangDoctor;
  120 + //产检医生
  121 + private String lastCheckEmployeeId;
120 122  
121 123 //高危因素
122 124 private String riskFactorId;
... ... @@ -393,6 +395,14 @@
393 395  
394 396 public void setDueDate(Date dueDate) {
395 397 this.dueDate = dueDate;
  398 + }
  399 +
  400 + public String getLastCheckEmployeeId() {
  401 + return lastCheckEmployeeId;
  402 + }
  403 +
  404 + public void setLastCheckEmployeeId(String lastCheckEmployeeId) {
  405 + this.lastCheckEmployeeId = lastCheckEmployeeId;
396 406 }
397 407 }