From 4f6c9dca1340dba26f43e880bf5c54bc3341fa66 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Tue, 27 Aug 2019 17:56:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E8=BF=BD=E8=AE=BF=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 8 ++++---- .../lyms/platform/operate/web/controller/TrackDownController.java | 4 ++-- .../com/lyms/platform/operate/web/service/ITrackDownService.java | 4 ++-- .../platform/operate/web/service/impl/TrackDownServiceImpl.java | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) 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 1e72ea4..5cca5f3 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 @@ -344,7 +344,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Integer followupStatus; //是否分娩 - private Boolean isDeliver; + private String isDeliver; //分娩方式 private String fmMode; @@ -368,12 +368,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.fmMode = fmMode; } - public Boolean isDeliver() { + public String getIsDeliver() { return isDeliver; } - public void setDeliver(Boolean deliver) { - isDeliver = deliver; + public void setIsDeliver(String isDeliver) { + this.isDeliver = isDeliver; } public Integer getFollowupStatus() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java index 14c5235..b4cc4f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java @@ -86,7 +86,7 @@ public class TrackDownController extends BaseController { @RequestMapping(value = "/all", method = RequestMethod.GET) public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer type, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request, - Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, Integer encryption) { + Integer check, String checkup, String pregnantBuild, Integer followupStatus, String isDeliver, Integer encryption) { return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, page, limit, getUserId(request), type, check, checkup, pregnantBuild, followupStatus, isDeliver, encryption); } @@ -96,7 +96,7 @@ public class TrackDownController extends BaseController { @RequestMapping(value = "/allExport", method = RequestMethod.GET) public void allExport(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer type, HttpServletRequest request, - Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption) { + Integer check, String checkup, String pregnantBuild, Integer followupStatus, String isDeliver, HttpServletResponse response, Integer encryption) { trackDownService.Export(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key , getUserId(request), type, check, checkup, pregnantBuild, followupStatus, isDeliver, response, encryption); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java index a844586..7f45322 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java @@ -18,11 +18,11 @@ public interface ITrackDownService extends IBaseService { BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId, Integer type, - Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, Integer encryption); + Integer check, String checkup, String pregnantBuild, Integer followupStatus, String isDeliver, Integer encryption); void Export(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer userId, Integer type, Integer check, String checkup, String pregnantBuild, - Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption); + Integer followupStatus, String isDeliver, HttpServletResponse response, Integer encryption); BaseObjectResponse info(String patientId, Integer trackType, Integer buildType); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 7dda351..a5bc5f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -72,7 +72,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS @Override public BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId, Integer type, Integer check, String checkup, String pregnantBuild, - Integer followupStatus, Boolean isDeliver, Integer encryption) { + Integer followupStatus, String isDeliver, Integer encryption) { String hospitalId = autoMatchFacade.getHospitalId(userId); List> restList = new ArrayList<>(); Integer archiveModelCount = 0; @@ -144,7 +144,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientsQuery.setHospitalId(hospitalId); patientsQuery.setQueryNo(key); patientsQuery.setFollowupStatus(followupStatus); - patientsQuery.setDeliver(isDeliver); + patientsQuery.setIsDeliver(isDeliver); //排查儿童建档时的零时建档 patientsQuery.setBuildType(1); @@ -170,7 +170,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS @Override public void Export(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer userId, Integer type, Integer check, String checkup, String pregnantBuild, - Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption) { + Integer followupStatus, String isDeliver, HttpServletResponse response, Integer encryption) { String hospitalId = autoMatchFacade.getHospitalId(userId); List> restList; Integer archiveModelCount = 0; @@ -203,7 +203,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientsQuery.setHospitalId(hospitalId); patientsQuery.setQueryNo(key); patientsQuery.setFollowupStatus(followupStatus); - patientsQuery.setDeliver(isDeliver); + patientsQuery.setIsDeliver(isDeliver); List patientsList = patientsService.queryPatient(patientsQuery); StopWatch stopWatch = new StopWatch("孕妇建档主数据"); -- 1.8.3.1