diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 47c66c3..ace04e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -2725,6 +2725,8 @@ public class PatientFacade extends BaseServiceImpl { for (Patients patients : patientsList) { PatientManagerQueryModel patientManagerQueryModel = new PatientManagerQueryModel(); BeanUtils.copy(patients, patientManagerQueryModel); + + patientManagerQueryModel.setTypeStr(patients.getType() == 1 ? "未分娩" : "已分娩"); patientManagerQueryModel.setYyzyfmHospitalName(couponMapper.getHospitalName(patients.getYyzyfmHospitalId())); patientManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth())); patientManagerQueryModel.setpId(patients.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java index 1abefb2..328648d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java @@ -9,6 +9,8 @@ import java.util.Date; */ public class PatientManagerRequest extends BasePageQueryRequest { + //1 未分娩 3 已分娩 + private Integer type; /*20201130 null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */ private String screening; @@ -52,6 +54,15 @@ public class PatientManagerRequest extends BasePageQueryRequest { //乐陵是妇幼母子保健手册下发机构 private String lowerHairOgrId; + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public String getLowerHairOgrId() { return lowerHairOgrId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java index 008af4b..afe3353 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java @@ -109,6 +109,17 @@ public class PatientManagerQueryModel { */ private String villageRegister; + private String typeStr; + + + public String getTypeStr() { + return typeStr; + } + + public void setTypeStr(String typeStr) { + this.typeStr = typeStr; + } + public String getVillageRegister() { return villageRegister; }