jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5f42a8f9a628a82d9359bf04832067bd1d996b27

Authored by zhangchao
1 parent 089b4cde17
Exists in dev

#fix:优化建档产检医生字段

Showing 4 changed files with 31 additions and 3 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 5f42a8f
... ... @@ -132,7 +132,7 @@
132 132 patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
133 133 query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());
134 134 }
135   - //System.out.println(query.convertToMongoQuery());
  135 + System.out.println(query.convertToMongoQuery());
136 136 return iPatientDao.queryPatient(query.addOrder(Sort.Direction.fromString(sort), field));
137 137 }
138 138  
platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java View file @ 5f42a8f
... ... @@ -274,6 +274,8 @@
274 274 ||"剖宫产".equals(allFm.getDelivery_MODE().trim()))
275 275 ) {
276 276 fmfs = FmTypeEnums.O1.getId();
  277 + }else if ("顺产".equals(allFm.getDelivery_MODE().trim())){
  278 + fmfs = FmTypeEnums.O.getId();
277 279 }
278 280 }else {
279 281 fmfs = FmTypeEnums.O.getId();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ 5f42a8f
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.common.utils.DateUtil;
4 4 import com.lyms.platform.common.utils.StringUtils;
  5 +import com.lyms.platform.operate.web.utils.CollectionUtils;
5 6 import com.lyms.platform.pojo.AntExChuModel;
6 7 import com.lyms.platform.pojo.AntenatalExaminationModel;
7 8 import com.lyms.platform.pojo.Patients;
... ... @@ -113,6 +114,25 @@
113 114 private String HIVJ;//人类免疫缺陷病毒抗体
114 115 private String tp;//梅毒螺旋体抗体
115 116  
  117 + private String prodDoctor;//初检医生
  118 + private String checkDoctor;//复检医生
  119 +
  120 + public String getProdDoctor() {
  121 + return prodDoctor;
  122 + }
  123 +
  124 + public void setProdDoctor(String prodDoctor) {
  125 + this.prodDoctor = prodDoctor;
  126 + }
  127 +
  128 + public String getCheckDoctor() {
  129 + return checkDoctor;
  130 + }
  131 +
  132 + public void setCheckDoctor(String checkDoctor) {
  133 + this.checkDoctor = checkDoctor;
  134 + }
  135 +
116 136 public String getPnationStr() {
117 137 return pnationStr;
118 138 }
... ... @@ -543,6 +563,12 @@
543 563 setHBsAgJ(patients.getHBsAgJ());
544 564 setHIVJ(patients.getHIVJ());
545 565 setTp(patients.getTp());
  566 + if (CollectionUtils.isNotEmpty(destModel)&&CollectionUtils.isNotEmpty(antExChuModel)){
  567 + setCheckDoctor(patients.getLastCheckEmployeeId());
  568 + }
  569 + if (CollectionUtils.isEmpty(antExChuModel)){
  570 + setProdDoctor(patients.getLastCheckEmployeeId());
  571 + }
546 572 }
547 573 return this;
548 574 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java View file @ 5f42a8f
... ... @@ -79,8 +79,8 @@
79 79 query.setBuildTypeList(patientsQuery.getBuildTypeList());
80 80 query.setHospitalId(patientsQuery.getHospitalId());
81 81 query.setDueStatus(patientsQuery.getDueStatus());
82   - //高危等级
83   - query.setrLevel(patientsQuery.getrLevel());
  82 + /* //高危等级
  83 + query.setrLevel(patientsQuery.getrLevel());*/
84 84 //产检医生
85 85 query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId());
86 86 query.setDueDateStart(patientsQuery.getDueDateStart());