From 07c7958dd4c6a8eeecfe413a133380a41a57f2ab Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Fri, 17 Nov 2017 16:41:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/enums/BasisEnums.java | 7 +--- .../main/java/com/lyms/platform/pojo/Patients.java | 8 ++--- .../operate/web/controller/ViewController.java | 20 ++--------- .../operate/web/facade/BookbuildingFacade.java | 26 +++++++++++---- .../platform/operate/web/facade/ViewFacade.java | 4 +-- .../web/request/YunBookbuildingAddRequest.java | 20 +++++++++++ .../operate/web/result/PregnantInfoResult.java | 39 ++++++++++++++++++++++ .../web/service/impl/ReportServiceImpl.java | 2 +- 8 files changed, 90 insertions(+), 36 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java index a2d4e91..d22a2f2 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java @@ -1,7 +1,5 @@ package com.lyms.platform.common.enums; -import com.lyms.platform.common.utils.StringUtils; - /** * 纠正依据 */ @@ -19,16 +17,13 @@ public enum BasisEnums { public static String getName(String id) { - if(StringUtils.isEmpty(id)) { - return null; - } BasisEnums[] values = BasisEnums.values(); for (BasisEnums value : values) { if (value.getId().equals(id)) { return value.getName(); } } - return null; + return ""; } private String id; private String name; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 7a09b69..1e0dfd8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -17,8 +17,8 @@ public class Patients extends BaseModel { private static final long serialVersionUID = SerialIdEnum.Patients.getCid(); - // 纠正末次月经 - private String fuckLastMens; + // 纠正末次月经 (和末次月经反起存) + private Date fuckLastMens; // 末次月经纠正依据 private String lastMenstrualPeriodBasis; // 末次月经纠正依据 @@ -28,7 +28,7 @@ public class Patients extends BaseModel { // 末次月经纠正时间 private String lastMenstrualPeriodBasisDate; - public String getFuckLastMens() { + public Date getFuckLastMens() { return fuckLastMens; } @@ -40,7 +40,7 @@ public class Patients extends BaseModel { this.lastMenstrualPeriodBasisOther = lastMenstrualPeriodBasisOther; } - public void setFuckLastMens(String fuckLastMens) { + public void setFuckLastMens(Date fuckLastMens) { this.fuckLastMens = fuckLastMens; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index fe00755..c3d9996 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -33,26 +33,12 @@ public class ViewController extends BaseController { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; - - /** - * 获取数据是否打印过 - * type = 1 初诊 - * type = 2 复诊 - */ - @RequestMapping(value = "/get/prient", method = RequestMethod.GET) - @ResponseBody - public BaseObjectResponse getIsPrient(@RequestParam String id) { - return viewFacade.getIsPrient(id); - } - /** - * 初诊复诊打印后回调controller - * type = 1 初诊 - * type = 2 复诊 + * 获取是否打印过 如果没打印 就把改id存下来 返回false 打印过 直接返回true */ - @RequestMapping(value = "/prient", method = RequestMethod.GET) + @RequestMapping(value = "/prient/{id}", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse prient(@RequestParam String id) { + public BaseObjectResponse prient(@PathVariable String id) { return viewFacade.prient(id); } 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 d572cc7..78cb96b 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 @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; @@ -103,7 +104,6 @@ public class BookbuildingFacade { @Autowired private CouponMapper couponMapper; - @Autowired private DeleteProcessHandler deleteProcessHandler; @@ -1102,6 +1102,16 @@ public class BookbuildingFacade { public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) { Patients patient = new Patients(); + + // 纠正末次月经和末次月经反起存 + if(StringUtils.isEmpty(yunRequest.getFuckLastMens())) { + patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); + } else { + patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); + patient.setLastMenses(DateUtil.parseYMD(yunRequest.getFuckLastMens())); + } + patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); + patient.setLastMenstrualPeriodBasis(yunRequest.getLastMenstrualPeriodBasis()); patient.setLastMenstrualPeriodBasisDoctorId(yunRequest.getLastMenstrualPeriodBasisDoctorId()); patient.setLastMenstrualPeriodBasisDate(yunRequest.getLastMenstrualPeriodBasisDate()); @@ -1206,7 +1216,9 @@ public class BookbuildingFacade { patient.setExpVip(yunRequest.getExpVip()); patient.setMremark(yunRequest.getMremark()); - patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); +// patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); + + patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate())); patient.setFileCode(yunRequest.getFileCode()); patient.setBookbuildingDoctor(yunRequest.getBookbuildingDoctor()); @@ -1249,12 +1261,14 @@ public class BookbuildingFacade { public PregnantInfoResult getResult(Patients p) { PregnantInfoResult result = new PregnantInfoResult(); - - result.setLastMenstrualPeriodBasis(p.getLastMenstrualPeriodBasis()); - result.setLastMenstrualPeriodBasisDoctorId(couponMapper.getUserName(p.getLastMenstrualPeriodBasisDoctorId())); + result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getFuckLastMens())); + result.setLastMenstrualPeriodBasis(BasisEnums.getName(p.getLastMenstrualPeriodBasis())); + result.setLastMenstrualPeriodBasisId(p.getLastMenstrualPeriodBasis()); + result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther()); + result.setLastMenstrualPeriodBasisDoctorId(p.getLastMenstrualPeriodBasisDoctorId()); + result.setLastMenstrualPeriodBasisDoctorName(couponMapper.getUserName(p.getLastMenstrualPeriodBasisDoctorId())); result.setLastMenstrualPeriodBasisDate(p.getLastMenstrualPeriodBasisDate()); - result.setMensStartDay(p.getMensStartDay()); result.setMensEndDay(p.getMensEndDay()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 5be4714..1703704 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -3707,7 +3707,7 @@ public class ViewFacade { public BaseObjectResponse prient(String id) { if(mongoTemplate.exists(Query.query(Criteria.where("value").is(id).and("type").is(SequenceConstant.PRIENT_TYPE)), PlantformConfigModel.class)) { - return RespBuilder.buildSuccess("已经打印过"); + return RespBuilder.buildSuccess(true); } PlantformConfigModel plantformConfigModel = new PlantformConfigModel(); plantformConfigModel.setType(SequenceConstant.PRIENT_TYPE); @@ -3715,6 +3715,6 @@ public class ViewFacade { plantformConfigModel.setCreateDate(new Date()); plantformConfigModel.setValue(id); mongoTemplate.save(plantformConfigModel); - return RespBuilder.buildSuccess(); + return RespBuilder.buildSuccess(false); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index b289ba2..77873f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -10,13 +10,33 @@ import org.hibernate.validator.constraints.NotEmpty; @Form public class YunBookbuildingAddRequest { + // 纠正末次月经 (和末次月经反起存) + private String fuckLastMens; // 末次月经纠正依据 private String lastMenstrualPeriodBasis; + // 末次月经纠正依据 + private String lastMenstrualPeriodBasisOther; // 末次月经纠正医生ID private String lastMenstrualPeriodBasisDoctorId; // 末次月经纠正时间 private String lastMenstrualPeriodBasisDate; + public String getFuckLastMens() { + return fuckLastMens; + } + + public void setFuckLastMens(String fuckLastMens) { + this.fuckLastMens = fuckLastMens; + } + + public String getLastMenstrualPeriodBasisOther() { + return lastMenstrualPeriodBasisOther; + } + + public void setLastMenstrualPeriodBasisOther(String lastMenstrualPeriodBasisOther) { + this.lastMenstrualPeriodBasisOther = lastMenstrualPeriodBasisOther; + } + public String getLastMenstrualPeriodBasis() { return lastMenstrualPeriodBasis; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 6f2ca04..26b09dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -7,13 +7,52 @@ import java.util.Map; */ public class PregnantInfoResult { + // 纠正末次月经 + private String fuckLastMens; // 末次月经纠正依据 private String lastMenstrualPeriodBasis; + private String lastMenstrualPeriodBasisId; + // 末次月经纠正依据 + private String lastMenstrualPeriodBasisOther; // 末次月经纠正医生ID private String lastMenstrualPeriodBasisDoctorId; + private String lastMenstrualPeriodBasisDoctorName; + + public String getLastMenstrualPeriodBasisDoctorName() { + return lastMenstrualPeriodBasisDoctorName; + } + + public void setLastMenstrualPeriodBasisDoctorName(String lastMenstrualPeriodBasisDoctorName) { + this.lastMenstrualPeriodBasisDoctorName = lastMenstrualPeriodBasisDoctorName; + } + // 末次月经纠正时间 private String lastMenstrualPeriodBasisDate; + public String getLastMenstrualPeriodBasisId() { + return lastMenstrualPeriodBasisId; + } + + public void setLastMenstrualPeriodBasisId(String lastMenstrualPeriodBasisId) { + this.lastMenstrualPeriodBasisId = lastMenstrualPeriodBasisId; + } + + public String getLastMenstrualPeriodBasisOther() { + return lastMenstrualPeriodBasisOther; + } + + public String getFuckLastMens() { + return fuckLastMens; + } + + public void setLastMenstrualPeriodBasisOther(String lastMenstrualPeriodBasisOther) { + this.lastMenstrualPeriodBasisOther = lastMenstrualPeriodBasisOther; + } + + public void setFuckLastMens(String fuckLastMens) { + this.fuckLastMens = fuckLastMens; + } + public String getLastMenstrualPeriodBasis() { return lastMenstrualPeriodBasis; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 6a2521a..7c80873 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -899,7 +899,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService map.put("username", p.getUsername()); map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(p.getPhone())); map.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(p.getCardNo())); - if(p.getType() == 3 && p.getBuildType() == 2) { + if(p.getType() == 3 || p.getBuildType() == 2) { map.put("week", "已分娩"); } else { map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); -- 1.8.3.1