diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index afb470c..882854e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -108,7 +108,6 @@ public class SieveFacade { sieveModel.setId(list.get(0).getId()); sieveModel.setHospitalId(hospitalId); sieveModel.setZtfx(sieveAddRequest.getMax()); - sieveModel.setDiagnosisTime(sieveResultModel.getDiagnosisTime()); sieveModel.setResultTime(sieveResultModel.getResultTime()); sieveService.updateOneChanQianDiaSieve(sieveModel); @@ -226,6 +225,7 @@ public class SieveFacade { sieveModel.setRenShenResult(chanQianDiaAddRequest.getPregnancyOutcome()); sieveModel.setStatus(4); sieveModel.setCqStatus(1); + sieveModel.setDiagnosisTime(chanQianDiaAddRequest.getDiagnosisTime() == null ? null : DateUtil.parseYMD(chanQianDiaAddRequest.getDiagnosisTime())); sieveService.updateOneChanQianDiaSieve(sieveModel); operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveModel, OptActionEnums.ADD.getId(), "产前诊断"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChanQianDiaAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChanQianDiaAddRequest.java index 7bebe8a..cb7c9ae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChanQianDiaAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChanQianDiaAddRequest.java @@ -23,6 +23,17 @@ public class ChanQianDiaAddRequest { @FormParam private String publishName;// 录入人员; + //诊断结果时间 + private String diagnosisTime; + + public String getDiagnosisTime() { + return diagnosisTime; + } + + public void setDiagnosisTime(String diagnosisTime) { + this.diagnosisTime = diagnosisTime; + } + public String getParentId() { return parentId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java index 7ff4015..b91188b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java @@ -31,8 +31,7 @@ public class SieveAddRequest implements IBasicRequestConvert { //结果录入时间 private String resultTime; - //诊断结果时间 - private String diagnosisTime; + public String getResultTime() { return resultTime; @@ -42,14 +41,6 @@ public class SieveAddRequest implements IBasicRequestConvert { this.resultTime = resultTime; } - public String getDiagnosisTime() { - return diagnosisTime; - } - - public void setDiagnosisTime(String diagnosisTime) { - this.diagnosisTime = diagnosisTime; - } - public String getCspj() { return cspj; } @@ -141,7 +132,6 @@ public class SieveAddRequest implements IBasicRequestConvert { sieveModel.setCspj(cspj); sieveModel.setStzhz13(stzhz13); sieveModel.setPublishName(publishName); - sieveModel.setDiagnosisTime(DateUtil.parseYMD(diagnosisTime)); sieveModel.setResultTime(DateUtil.parseYMD(resultTime)); return sieveModel; }