Commit 7fb0c6796494323c76065d1964c4f45b10beb42d
1 parent
5f7bde3440
Exists in
master
and in
6 other branches
民生工程
Showing 2 changed files with 13 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java
View file @
7fb0c67
| ... | ... | @@ -85,8 +85,9 @@ |
| 85 | 85 | @RequestMapping(value = "/getMsgcC201", method = RequestMethod.GET) |
| 86 | 86 | @ResponseBody |
| 87 | 87 | public BaseObjectResponse getMsgcC201(@RequestParam(required = false) String startDate, |
| 88 | - @RequestParam(required = false) String endDate) { | |
| 89 | - return livelihoodProjectsFacade.getMsgcC201(startDate,endDate); | |
| 88 | + @RequestParam(required = false) String endDate, | |
| 89 | + @RequestParam(required = false) String cardNo) { | |
| 90 | + return livelihoodProjectsFacade.getMsgcC201(startDate,endDate,cardNo); | |
| 90 | 91 | } |
| 91 | 92 | /** |
| 92 | 93 | * 孕分娩记录（主）C301 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
View file @
7fb0c67
| ... | ... | @@ -769,21 +769,26 @@ |
| 769 | 769 | return objectResponse; |
| 770 | 770 | } |
| 771 | 771 | |
| 772 | - public BaseObjectResponse getMsgcC201(String startDate, String endDate) { | |
| 772 | + public BaseObjectResponse getMsgcC201(String startDate, String endDate,String cardNo) { | |
| 773 | 773 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 774 | 774 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 775 | 775 | patientsQuery.setTypeList(Arrays.asList(1,3));//孕妇，产妇 |
| 776 | 776 | patientsQuery.setExtEnable(false); |
| 777 | 777 | patientsQuery.setBuildTypeNot(1); |
| 778 | + if (StringUtils.isNotEmpty(cardNo)) | |
| 779 | + { | |
| 780 | + patientsQuery.setCardNo(cardNo); | |
| 781 | + } | |
| 778 | 782 | |
| 779 | 783 | if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) { |
| 780 | 784 | patientsQuery.setBookbuildingDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate))); |
| 781 | 785 | patientsQuery.setBookbuildingDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate))); |
| 782 | - }else { | |
| 783 | - //默认获取当天数据 | |
| 784 | - patientsQuery.setBookbuildingDateStart(DateUtil.getDayFirstSecond(new Date())); | |
| 785 | - patientsQuery.setBookbuildingDateEnd(DateUtil.getDayLastSecond(new Date())); | |
| 786 | 786 | } |
| 787 | +// else { | |
| 788 | +// //默认获取当天数据 | |
| 789 | +// patientsQuery.setBookbuildingDateStart(DateUtil.getDayFirstSecond(new Date())); | |
| 790 | +// patientsQuery.setBookbuildingDateEnd(DateUtil.getDayLastSecond(new Date())); | |
| 791 | +// } | |
| 787 | 792 | List <Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 788 | 793 | List<Map> data = new ArrayList<>(); |
| 789 | 794 | for (Patients patients : patientsList) { |