diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 5378932..7e7b412 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -41,8 +41,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Boolean isHighRisk; //分娩状态 0未终止妊娠 1终止妊娠 private Integer dueStatus; - - + //是否发放母子保健手册 + private String sendCareMan; /** * 产妇名称 */ @@ -78,6 +78,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.gtePostTimes = gtePostTimes; } + public String getSendCareMan() { + return sendCareMan; + } + + public void setSendCareMan(String sendCareMan) { + this.sendCareMan = sendCareMan; + } + /** * 访视状态 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 6e68632..8b2a203 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2486,6 +2486,7 @@ public class AntenatalExaminationFacade { antexChuResult.setDiagnosis(queryRisk(list, false).getHighRisk()); } } catch (Exception e) { + } try { if (StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index f74bc3b..fa963ed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -295,7 +295,7 @@ public class BookbuildingFacade { patient.setModified(new Date()); patient.setOperator(userId); - //新增孕妇档案 + //孕妇档案 Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); //添加追访信息 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 255e59b..2c8e284 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 @@ -1021,6 +1021,7 @@ public class PatientFacade { PatientManagerResult patientManagerResult = new PatientManagerResult(); PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setSendCareMan(patientManagerRequest.getSendCareMan()); if (patientManagerRequest.getBuildWeekStart() != null) { patientsQuery.setBuildDaysStart(patientManagerRequest.getBuildWeekStart() * 7); } @@ -1123,6 +1124,13 @@ public class PatientFacade { patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); patientManagerQueryModel.setId(patients.getId()); + if(patients.getSendCareMan()!=null){ + if("0".equals(patients.getSendCareMan())){ + patientManagerQueryModel.setSendCareMan("否"); + }else if("1".equals(patients.getSendCareMan())){ + patientManagerQueryModel.setSendCareMan("是"); + } + } patientManagerQueryModelList.add(patientManagerQueryModel); } } 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 b2898f0..d18ef75 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 @@ -16,6 +16,9 @@ public class PatientManagerRequest extends BasePageQueryRequest { */ private String provinceRegisterId; + //是否发放母子保健手册 + private String sendCareMan; + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时59分 @@ -37,6 +40,14 @@ public class PatientManagerRequest extends BasePageQueryRequest { private String areaId; private String streetId; + public String getSendCareMan() { + return sendCareMan; + } + + public void setSendCareMan(String sendCareMan) { + this.sendCareMan = sendCareMan; + } + public String getStreetId() { return streetId; }