jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4f6c9dca1340dba26f43e880bf5c54bc3341fa66

Authored by [wangbo]
1 parent cbcbaefddd
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

孕妇追访历史数据处理完成

Showing 4 changed files with 12 additions and 12 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 4f6c9dc
... ... @@ -344,7 +344,7 @@
344 344 private Integer followupStatus;
345 345  
346 346 //是否分娩
347   - private Boolean isDeliver;
  347 + private String isDeliver;
348 348  
349 349 //分娩方式
350 350 private String fmMode;
351 351  
... ... @@ -368,12 +368,12 @@
368 368 this.fmMode = fmMode;
369 369 }
370 370  
371   - public Boolean isDeliver() {
  371 + public String getIsDeliver() {
372 372 return isDeliver;
373 373 }
374 374  
375   - public void setDeliver(Boolean deliver) {
376   - isDeliver = deliver;
  375 + public void setIsDeliver(String isDeliver) {
  376 + this.isDeliver = isDeliver;
377 377 }
378 378  
379 379 public Integer getFollowupStatus() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java View file @ 4f6c9dc
... ... @@ -86,7 +86,7 @@
86 86 @RequestMapping(value = "/all", method = RequestMethod.GET)
87 87 public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer type,
88 88 @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request,
89   - Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, Integer encryption) {
  89 + Integer check, String checkup, String pregnantBuild, Integer followupStatus, String isDeliver, Integer encryption) {
90 90 return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key,
91 91 page, limit, getUserId(request), type, check, checkup, pregnantBuild, followupStatus, isDeliver, encryption);
92 92 }
... ... @@ -96,7 +96,7 @@
96 96 @RequestMapping(value = "/allExport", method = RequestMethod.GET)
97 97 public void allExport(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer type,
98 98 HttpServletRequest request,
99   - Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption) {
  99 + Integer check, String checkup, String pregnantBuild, Integer followupStatus, String isDeliver, HttpServletResponse response, Integer encryption) {
100 100 trackDownService.Export(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key
101 101 , getUserId(request), type, check, checkup, pregnantBuild, followupStatus, isDeliver, response, encryption);
102 102 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java View file @ 4f6c9dc
... ... @@ -18,11 +18,11 @@
18 18  
19 19 BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart,
20 20 Date fmEnd, String key, Integer page, Integer limit, Integer userId, Integer type,
21   - Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, Integer encryption);
  21 + Integer check, String checkup, String pregnantBuild, Integer followupStatus, String isDeliver, Integer encryption);
22 22  
23 23 void Export(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key,
24 24 Integer userId, Integer type, Integer check, String checkup, String pregnantBuild,
25   - Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption);
  25 + Integer followupStatus, String isDeliver, HttpServletResponse response, Integer encryption);
26 26  
27 27 BaseObjectResponse info(String patientId, Integer trackType, Integer buildType);
28 28  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 4f6c9dc
... ... @@ -72,7 +72,7 @@
72 72 @Override
73 73 public BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key,
74 74 Integer page, Integer limit, Integer userId, Integer type, Integer check, String checkup, String pregnantBuild,
75   - Integer followupStatus, Boolean isDeliver, Integer encryption) {
  75 + Integer followupStatus, String isDeliver, Integer encryption) {
76 76 String hospitalId = autoMatchFacade.getHospitalId(userId);
77 77 List<Map<String, Object>> restList = new ArrayList<>();
78 78 Integer archiveModelCount = 0;
... ... @@ -144,7 +144,7 @@
144 144 patientsQuery.setHospitalId(hospitalId);
145 145 patientsQuery.setQueryNo(key);
146 146 patientsQuery.setFollowupStatus(followupStatus);
147   - patientsQuery.setDeliver(isDeliver);
  147 + patientsQuery.setIsDeliver(isDeliver);
148 148 //排查儿童建档时的零时建档
149 149 patientsQuery.setBuildType(1);
150 150  
... ... @@ -170,7 +170,7 @@
170 170 @Override
171 171 public void Export(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key,
172 172 Integer userId, Integer type, Integer check, String checkup, String pregnantBuild,
173   - Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption) {
  173 + Integer followupStatus, String isDeliver, HttpServletResponse response, Integer encryption) {
174 174 String hospitalId = autoMatchFacade.getHospitalId(userId);
175 175 List<Map<String, Object>> restList;
176 176 Integer archiveModelCount = 0;
... ... @@ -203,7 +203,7 @@
203 203 patientsQuery.setHospitalId(hospitalId);
204 204 patientsQuery.setQueryNo(key);
205 205 patientsQuery.setFollowupStatus(followupStatus);
206   - patientsQuery.setDeliver(isDeliver);
  206 + patientsQuery.setIsDeliver(isDeliver);
207 207  
208 208 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
209 209 StopWatch stopWatch = new StopWatch("孕妇建档主数据");