jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 77c15f8e105ecc74149185f5de8d12e67dd57ce7

Authored by zhangchao
1 parent 8c94b5292a
Exists in dev

#fix:优化五色管理科室统计逻辑，去掉医生为空不查询的逻辑

Showing 2 changed files with 8 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java View file @ 77c15f8
... ... @@ -627,7 +627,7 @@
627 627 patientsQuery.setYn(1);
628 628 patientsQuery.setHospitalId("2100002419");
629 629 for (AppointmentModel appointmentModel : list) {
630   - if (StringUtils.isNotEmpty(appointmentModel.getDoctor())){
  630 +
631 631 Map<String, Object> result = new LinkedHashMap<>();
632 632 String idCard=appointmentModel.getIdCard();
633 633 String phone=appointmentModel.getPhone();
634 634  
... ... @@ -685,11 +685,11 @@
685 685 result.put("服务截至时间",DateUtil.gety_m_dhm(appointmentModel.getSerEndTime()));
686 686 result.put("建档时间",DateUtil.getYyyyMmDd(appointmentModel.getBookbuildingDate()));
687 687 result.put("就诊时间",DateUtil.gety_m_dhm(appointmentModel.getCheckTime()));
688   - result.put("就诊医生",appointmentModel.getDoctor());
  688 + result.put("就诊医生",StringUtils.isNotEmpty(appointmentModel.getDoctor())?appointmentModel.getDoctor():"-");
689 689 result.put("科室", appointmentModel.getDept());
690 690 result.put("预约时间",DateUtil.gety_m_dhm(appointmentModel.getCreated()));
691 691 results.add(result);
692   - }
  692 +
693 693 }
694 694 }
695 695 ResponseUtil.responseExcel(cnames, results, response);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java View file @ 77c15f8
... ... @@ -675,7 +675,6 @@
675 675 b=false;
676 676 }
677 677 List<AppointmentModel> checkList=new ArrayList<>();
678   -
679 678 PatientsQuery patientsQuery =new PatientsQuery();
680 679 patientsQuery.setYn(1);
681 680 patientsQuery.setHospitalId(hospitalId);
... ... @@ -828,8 +827,7 @@
828 827 for (int i = 0,j=modelList.size(); i < j; i++) {
829 828 AppointmentModel appointmentModel= modelList.get(i);
830 829 String depts=appointmentModel.getDept();
831   - String doctorName=appointmentModel.getDoctor();
832   - if (StringUtils.isNotEmpty(depts)&&StringUtils.isNotEmpty(doctorName)){
  830 + if (StringUtils.isNotEmpty(depts)){
833 831 AppointmentData appointmentData= params.get(depts);
834 832 if (appointmentData==null){
835 833 appointmentData=new AppointmentData();
... ... @@ -949,8 +947,7 @@
949 947 patientsQuery.setHospitalId(hospitalId);
950 948 for (int i = 0,j=modelList.size(); i < j; i++) {
951 949 AppointmentModel appointmentModel= modelList.get(i);
952   - String doctorName=appointmentModel.getDoctor();
953   - if (StringUtils.isNotEmpty(doctorName)){
  950 + String doctorName=StringUtils.isNotEmpty(appointmentModel.getDoctor())?appointmentModel.getDoctor():"-";
954 951 AppointmentData appointmentData= params.get(doctorName);
955 952 if (appointmentData==null){
956 953 appointmentData=new AppointmentData();
... ... @@ -994,7 +991,6 @@
994 991 }
995 992 appointmentData.setAppointmentNum(appointmentData.getAppointmentNum()!=null?appointmentData.getAppointmentNum()+1:1);
996 993 params.put(doctorName,appointmentData);
997   - }
998 994 }
999 995 baseResponse.setObject(params);
1000 996 }
... ... @@ -1053,10 +1049,8 @@
1053 1049 patientsQuery.setHospitalId(hospitalId);
1054 1050 for (int i = 0,j=modelList.size(); i < j; i++) {
1055 1051 AppointmentModel appointmentModel= modelList.get(i);
1056   - String doctorName=appointmentModel.getDoctor();
1057   -
1058   - if (StringUtils.isNotEmpty(doctorName)){
1059   - String depts=appointmentModel.getDept();
  1052 + String doctorName=StringUtils.isNotEmpty(appointmentModel.getDoctor())?appointmentModel.getDoctor():"-";
  1053 + String depts=appointmentModel.getDept();
1060 1054 Map<String,Object> appointmentData= params1.get(doctorName+","+depts);
1061 1055 if (appointmentData==null){
1062 1056 appointmentData=new HashMap<>();
... ... @@ -1098,7 +1092,7 @@
1098 1092 }
1099 1093 appointmentData.put("appointmentNum",appointmentData.get("appointmentNum")!=null?Integer.valueOf(String.valueOf(appointmentData.get("appointmentNum")))+1:1);
1100 1094 params1.put(doctorName+","+depts,appointmentData);
1101   - }
  1095 +
1102 1096 }
1103 1097 for (Map.Entry<String,Map<String,Object>> entry: params1.entrySet()) {
1104 1098 Map<String,Object> value= entry.getValue();