liquanyu / regional-platform

Download as
Browse Code »

Commit 42b05ce9129f6c8be0491b17e4b27e51fcfc0c9b

Authored by liquanyu
1 parent bb12f5a10a
Exists in master and in 1 other branch dev

update

Showing 5 changed files with 11 additions and 11 deletions

platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java View file @ 42b05ce
... ... @@ -125,7 +125,7 @@
125 125 private String spouseName;
126 126  
127 127 //是否婚检 0 未婚检 1婚检
128   - private String checkup;
  128 + private Integer checkup;
129 129  
130 130 //是否怀孕建档 0 否 1 是
131 131 private String pregnantBuild;
... ... @@ -150,7 +150,7 @@
150 150 if (StringUtils.isNotBlank(id)) {
151 151 condition = condition.and("id", id, MongoOper.IS);
152 152 }
153   - if (StringUtils.isNotEmpty(checkup)) {
  153 + if (checkup != null) {
154 154 condition = condition.and("checkup", checkup, MongoOper.IS);
155 155 }
156 156 if (isHistory) {
157 157  
... ... @@ -430,11 +430,11 @@
430 430 this.pregnantBuild = pregnantBuild;
431 431 }
432 432  
433   - public String getCheckup() {
  433 + public Integer getCheckup() {
434 434 return checkup;
435 435 }
436 436  
437   - public void setCheckup(String checkup) {
  437 + public void setCheckup(Integer checkup) {
438 438 this.checkup = checkup;
439 439 }
440 440  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java View file @ 42b05ce
... ... @@ -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, String isDeliver, Integer encryption,@RequestParam(required = false,defaultValue = "false") boolean isArea) {
  89 + Integer check, Integer checkup, String pregnantBuild, Integer followupStatus, String isDeliver, Integer encryption,@RequestParam(required = false,defaultValue = "false") boolean isArea) {
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,isArea);
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, String isDeliver, HttpServletResponse response, Integer encryption) {
  99 + Integer check, Integer 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 @ 42b05ce
... ... @@ -18,10 +18,10 @@
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, String isDeliver, Integer encryption,boolean isArea);
  21 + Integer check, Integer checkup, String pregnantBuild, Integer followupStatus, String isDeliver, Integer encryption,boolean isArea);
22 22  
23 23 void Export(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key,
24   - Integer userId, Integer type, Integer check, String checkup, String pregnantBuild,
  24 + Integer userId, Integer type, Integer check, Integer checkup, String pregnantBuild,
25 25 Integer followupStatus, String isDeliver, HttpServletResponse response, Integer encryption);
26 26  
27 27 BaseObjectResponse info(String patientId, Integer trackType, Integer buildType);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 42b05ce
... ... @@ -592,7 +592,7 @@
592 592 //查询条件
593 593 ResidentsArchiveQuery query = new ResidentsArchiveQuery();
594 594 query.setYn(YnEnums.YES.getId());
595   - query.setCheckup("1");
  595 + query.setCheckup(1);
596 596 query.setSex(SystemConfig.WOMAN_ID);
597 597 query.setStreetId(item.getId());
598 598  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 42b05ce
... ... @@ -72,7 +72,7 @@
72 72 */
73 73 @Override
74 74 public BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key,
75   - Integer page, Integer limit, Integer userId, Integer type, Integer check, String checkup, String pregnantBuild,
  75 + Integer page, Integer limit, Integer userId, Integer type, Integer check, Integer checkup, String pregnantBuild,
76 76 Integer followupStatus, String isDeliver, Integer encryption,boolean isArea) {
77 77 String hospitalId = autoMatchFacade.getHospitalId(userId);
78 78 List<Map<String, Object>> restList = new ArrayList<>();
... ... @@ -187,7 +187,7 @@
187 187  
188 188 @Override
189 189 public void Export(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key,
190   - Integer userId, Integer type, Integer check, String checkup, String pregnantBuild,
  190 + Integer userId, Integer type, Integer check, Integer checkup, String pregnantBuild,
191 191 Integer followupStatus, String isDeliver, HttpServletResponse response, Integer encryption) {
192 192 String hospitalId = autoMatchFacade.getHospitalId(userId);
193 193 List<Map<String, Object>> restList;