liquanyu / regional-platform

Download as
Browse Code »

Commit 75d0fcb0404ba581c59ce107e45a052dfc71035f

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

update

Showing 5 changed files with 19 additions and 9 deletions

platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml View file @ 75d0fcb
... ... @@ -222,6 +222,16 @@
222 222 #{title}
223 223 </foreach>
224 224 </if>
  225 +
  226 +
  227 + <if test="names != null and names.size() !=0 ">
  228 + AND name IN
  229 + <foreach collection="names" item="name"
  230 + index="index" open="(" close=")" separator=",">
  231 + #{name}
  232 + </foreach>
  233 + </if>
  234 +
225 235 <if test="lastLoginTime != null">
226 236 and last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP}
227 237 </if>
platform-operate-api/src/main/java/com/lyms/hospitalapi/lpfy/LpfyFmService.java View file @ 75d0fcb
... ... @@ -170,7 +170,7 @@
170 170  
171 171 UsersQuery usersQuery = new UsersQuery();
172 172 usersQuery.setYn(YnEnums.YES.getId());
173   - usersQuery.setName("产房");
  173 + usersQuery.setName("滦平县妇幼保健院");
174 174 usersQuery.setOrgId(new Integer(Integer.parseInt(HOSPITALID)));
175 175 List<Users> users = usersService.queryUsers(usersQuery);
176 176  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ 75d0fcb
... ... @@ -576,16 +576,16 @@
576 576  
577 577 /**
578 578 *儿童健康管理率统计
579   - * @param checkTime
  579 + * @param time
580 580 * @param request
581 581 * @return
582 582 */
583 583 @RequestMapping(method = RequestMethod.GET, value = "/getBabyManageRateCount")
584 584 @ResponseBody
585 585 @TokenRequired
586   - public BaseResponse getBabyManageRateCount(@RequestParam(required = false) String checkTime,
  586 + public BaseResponse getBabyManageRateCount(@RequestParam(required = false) String time,
587 587 HttpServletRequest request) {
588   - return babyCheckFacade.getBabyManageRateCount(checkTime, getUserId(request));
  588 + return babyCheckFacade.getBabyManageRateCount(time, getUserId(request));
589 589 }
590 590 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 75d0fcb
... ... @@ -3652,7 +3652,7 @@
3652 3652  
3653 3653 UsersQuery usersQuery = new UsersQuery();
3654 3654 usersQuery.setOrgId(Integer.parseInt(hospitalId));
3655   - usersQuery.setNames(Arrays.asList("刘桂芬", "贾淑平", "付冬华", "宋伟", "俢素英", "李雅玲", "郝艳清", "李彩岩", "魏秀丽","隆化妇幼"));
  3655 + usersQuery.setNames(Arrays.asList("刘桂芬", "贾淑平", "付冬华", "宋伟", "俢素英", "李雅玲", "郝艳清", "李彩岩", "魏秀丽"));
3656 3656 List<Users> users = usersService.queryUsers(usersQuery);
3657 3657 Date startDate = null;
3658 3658 Date endDate = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ 75d0fcb
... ... @@ -1297,7 +1297,7 @@
1297 1297 }
1298 1298  
1299 1299 patientsQuery.setNeed("true");
1300   - patientsQuery.setLimit(10000);
  1300 + patientsQuery.setLimit(1000);
1301 1301 int page = 1;
1302 1302 while (true)
1303 1303 {
... ... @@ -1342,7 +1342,7 @@
1342 1342 }
1343 1343 antExChuQuery.setNeed("true");
1344 1344  
1345   - antExChuQuery.setLimit(10000);
  1345 + antExChuQuery.setLimit(1000);
1346 1346 int page = 1;
1347 1347 while (true)
1348 1348 {
... ... @@ -1481,7 +1481,7 @@
1481 1481 }
1482 1482 antExQuery.setNeed("true");
1483 1483  
1484   - antExQuery.setLimit(10000);
  1484 + antExQuery.setLimit(1000);
1485 1485 int page = 1;
1486 1486 while (true)
1487 1487 {
... ... @@ -1570,7 +1570,7 @@
1570 1570 matDeliverQuery.setModifiedStart(start);
1571 1571 matDeliverQuery.setModifiedEnd(end);
1572 1572 matDeliverQuery.setNeed("true");
1573   - matDeliverQuery.setLimit(10000);
  1573 + matDeliverQuery.setLimit(1000);
1574 1574 int page = 1;
1575 1575 while (true)
1576 1576 {