diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 63501e7..13c94fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest; import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.DischargeAbstractBabyModel; import com.lyms.platform.pojo.DischargeAbstractMotherModel; import com.lyms.platform.pojo.Patients; @@ -53,6 +54,9 @@ public class DischargeAbstractFacade { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + @Autowired + private UsersService usersService; + public DischargeAbstractSaveResult save(DischargeAbstractSaveRequest dischargeAbstractSaveRequest) { DischargeAbstractSaveResult dischargeAbstractSaveResult = new DischargeAbstractSaveResult(); @@ -180,6 +184,11 @@ public class DischargeAbstractFacade { DischargeAbstractMotherQueryModel dischargeAbstractMotherQueryModel = new DischargeAbstractMotherQueryModel(); BeanUtils.copy(dischargeAbstractMotherModelList.get(0), dischargeAbstractMotherQueryModel); dischargeAbstractMotherQueryModel.setLeaveHospitalDate(DateUtil.getyyyy_MM_dd(dischargeAbstractMotherModelList.get(0).getLeaveHospitalDate())); + try { + dischargeAbstractMotherQueryModel.setInputMan(usersService.getUsers(Integer.valueOf(dischargeAbstractMotherModelList.get(0).getInputMan())).getName()); + } catch (Exception e) { + // 跳过 + } dischargeAbstractQueryResult.setDischargeAbstractMotherQueryModel(dischargeAbstractMotherQueryModel); // 查询孩子信息 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 4e4e543..bb65319 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 @@ -768,7 +768,7 @@ public class PatientFacade { usersQuery.setName(patientManagerRequest.getBookbuildingDoctor()); usersQuery.setYn(YnEnums.YES.getId()); List usersList = usersService.queryUsers(usersQuery); - if(CollectionUtils.isNotEmpty(usersList)){ + if (CollectionUtils.isNotEmpty(usersList)) { List bookbuildingDoctorList = new ArrayList<>(); for (Users users : usersList) { bookbuildingDoctorList.add(users.getId().toString()); @@ -796,26 +796,24 @@ public class PatientFacade { PatientManagerQueryModel patientManagerQueryModel = new PatientManagerQueryModel(); BeanUtils.copy(patients, patientManagerQueryModel); patientManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth())); - switch (patients.getBuildType()) { - case 0: - patientManagerQueryModel.setServiceType("未分娩建档"); - break; - case 1: - patientManagerQueryModel.setServiceType("儿童建档时建档"); - break; - case 2: - patientManagerQueryModel.setServiceType("自动分娩类型"); - break; - case 3: - patientManagerQueryModel.setServiceType("转诊自动建档"); - break; - default: - patientManagerQueryModel.setServiceType(""); + String dueWeek = ""; + try { + if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) { + dueWeek = "已分娩"; + } else { + int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); + String week = (days / 7) + ""; + int day = (days % 7); + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + } + } catch (Exception e) { + // 什么都不干 } + patientManagerQueryModel.setBuildWeek(dueWeek); patientManagerQueryModel.setBookbuildingDoctor(StringUtils.isEmpty(patients.getBookbuildingDoctor()) ? "" : usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor())).getName()); patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); + patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); - patientManagerQueryModel.setHusbandAddressRegister(CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(), patients.getHareaRegisterId(), patients.getHstreetRegisterId(), patients.getHaddressRegister(), basicConfigService)); patientManagerQueryModelList.add(patientManagerQueryModel); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index ba8a57a..ff8bfbb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -35,8 +35,6 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { */ private String husbandPhone; - // TODO 高帆说条码号暂时先不管 - /** * @auther HuJiaqi * @createTime 2016年12月21日 10时41分 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java index 2630871..5d950b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java @@ -30,8 +30,6 @@ public class NewBabyManagerRequest extends BasePageQueryRequest { private boolean isExcel; - // TODO 条码号暂时不管 - private Integer operatorId; public boolean isExcel() { 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 ac3ba18..aaf6504 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 @@ -34,7 +34,7 @@ public class PatientManagerRequest extends BasePageQueryRequest { private String provinceId; private String cityId; private String areaId; - + /** * @auther HuJiaqi * @createTime 2016年12月22日 11时12分 @@ -56,8 +56,6 @@ public class PatientManagerRequest extends BasePageQueryRequest { */ private String queryNo; - // 条码号暂时不管 - public String getProvinceRegisterId() { return provinceRegisterId; } 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 1a92c9e..4e945a5 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 @@ -13,69 +13,62 @@ public class PatientManagerQueryModel { * @discription 姓名 */ private String username; - + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时42分 * @discription 年龄 */ private Integer age; - + /** * @auther HuJiaqi - * @createTime 2016年12月20日 14时42分 - * @discription 联系电话 + * @createTime 2016年12月23日 09时54分 + * @discription 建档孕周 */ - private String phone; - + private String buildWeek; + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时42分 - * @discription 证件号码 + * @discription 联系电话 */ - private String cardNo; - + private String phone; + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时42分 - * @discription 户口所在地 + * @discription 丈夫姓名 */ - private String addressRegister; - + private String husbandName; + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时42分 - * @discription 丈夫姓名 + * @discription 居住地 */ - private String husbandName; - + private String address; + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时42分 - * @discription 丈夫户口所在地 + * @discription 户口所在地 */ - private String husbandAddressRegister; - + private String addressRegister; + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时43分 * @discription 建档时间 */ private String bookbuildingDate; - + /** * @auther HuJiaqi * @createTime 2016年12月20日 14时43分 * @discription 建档医生 */ private String bookbuildingDoctor; - - /** - * @auther HuJiaqi - * @createTime 2016年12月20日 14时43分 - * @discription 服务类型 - */ - private String serviceType; public String getUsername() { return username; @@ -93,20 +86,20 @@ public class PatientManagerQueryModel { this.age = age; } - public String getPhone() { - return phone; + public String getBuildWeek() { + return buildWeek; } - public void setPhone(String phone) { - this.phone = phone; + public void setBuildWeek(String buildWeek) { + this.buildWeek = buildWeek; } - public String getCardNo() { - return cardNo; + public String getPhone() { + return phone; } - public void setCardNo(String cardNo) { - this.cardNo = cardNo; + public void setPhone(String phone) { + this.phone = phone; } public String getHusbandName() { @@ -117,20 +110,20 @@ public class PatientManagerQueryModel { this.husbandName = husbandName; } - public String getAddressRegister() { - return addressRegister; + public String getAddress() { + return address; } - public void setAddressRegister(String addressRegister) { - this.addressRegister = addressRegister; + public void setAddress(String address) { + this.address = address; } - public String getHusbandAddressRegister() { - return husbandAddressRegister; + public String getAddressRegister() { + return addressRegister; } - public void setHusbandAddressRegister(String husbandAddressRegister) { - this.husbandAddressRegister = husbandAddressRegister; + public void setAddressRegister(String addressRegister) { + this.addressRegister = addressRegister; } public String getBookbuildingDate() { @@ -148,12 +141,4 @@ public class PatientManagerQueryModel { public void setBookbuildingDoctor(String bookbuildingDoctor) { this.bookbuildingDoctor = bookbuildingDoctor; } - - public String getServiceType() { - return serviceType; - } - - public void setServiceType(String serviceType) { - this.serviceType = serviceType; - } }