fangcheng / regional-platform

Download as
Browse Code ยป

Commit c039bada20c80ba04f279365ce955bf83520086b

Authored by liquanyu
1 parent 3cc4affd5c
Exists in master and in 1 other branch nobuildprocess

code update

Showing 2 changed files with 119 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java View file @ c039bad
... ... @@ -166,9 +166,37 @@
166 166 @RequestMapping(value = "/queryChanJianReport", method = RequestMethod.GET)
167 167 @ResponseBody
168 168 @TokenRequired
169   - public BaseObjectResponse queryChanJianReport(HttpServletRequest request){
  169 + public BaseObjectResponse queryChanJianReport(HttpServletRequest request,
  170 + @RequestParam(required = false) String exDateStart,
  171 + @RequestParam(required = false) String exDateEnd,
  172 + @RequestParam(required = false) String name,
  173 + @RequestParam(required = false) Integer weekStarts,
  174 + @RequestParam(required = false) Integer weekEnds,
  175 + @RequestParam(required = false) String hbsab,
  176 + @RequestParam(required = false) String hbeag,
  177 + @RequestParam(required = false) String hbeab,
  178 + @RequestParam(required = false) String hbcab,
  179 + @RequestParam(required = false) String syphilis,
  180 + @RequestParam(required = false) String hiv,
  181 + @RequestParam(required = false) String hcv,
  182 + @RequestParam(required = false) String doctorNo
  183 + ){
170 184 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
171   - BaseObjectResponse objectResponse = bookbuildingFacade.queryChanJianReport(loginState.getId());
  185 + BaseObjectResponse objectResponse = bookbuildingFacade.queryChanJianReport(loginState.getId(),
  186 + exDateStart,
  187 + exDateEnd,
  188 + name,
  189 + weekStarts,
  190 + weekEnds,
  191 + hbsab,
  192 + hbeag,
  193 + hbeab,
  194 + hbcab,
  195 + syphilis,
  196 + hiv,
  197 + hcv,
  198 + doctorNo
  199 + );
172 200 return objectResponse;
173 201 }
174 202 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ c039bad
... ... @@ -1049,14 +1049,26 @@
1049 1049 return objectResponse;
1050 1050 }
1051 1051  
1052   - public BaseObjectResponse queryChanJianReport(Integer userId) {
  1052 + public BaseObjectResponse queryChanJianReport(Integer userId, String exDateStart,
  1053 + String exDateEnd,
  1054 + String name,
  1055 + Integer weekStarts,
  1056 + Integer weekEnds,
  1057 + String hbsag,
  1058 + String hbeag,
  1059 + String hbeab,
  1060 + String hbcab,
  1061 + String syphilis,
  1062 + String hiv,
  1063 + String hcv,
  1064 + String doctorNo) {
1053 1065  
1054 1066 String hospitalId = autoMatchFacade.getHospitalId(userId);
1055 1067 String sql = "SELECT A.EXAMINE_DATE,\n" +
1056 1068 " A.NAME,\n" +
1057 1069 " A.AGE,\n" +
1058 1070 " A.NOW_WEEKS,\n" +
1059   - " A.NOW_WEEKS_DAY,\n" +
  1071 + " A.NOW_WEEKS_DAY, \n" +
1060 1072 " B.EDD_DATE,\n" +
1061 1073 " A.HBSAG,\n" +
1062 1074 " A.HBSAB,\n" +
... ... @@ -1075,11 +1087,81 @@
1075 1087 " DECODE(B.IS_VIP_ID,1,'ๅขžๅ€ผๆœๅŠก','ๆ ‡ๅ‡†ๆœๅŠก') AS SERVICE_STATUS,\n" +
1076 1088 " A.SUGGESTION,\n" +
1077 1089 " B.TEL_NO,\n" +
1078   - " B.HOME_ADDR\n" +
1079   - " FROM ODS_F_AUXILIARY_EXAMI A\n" +
1080   - " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID\n" +
1081   - " INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO\n" +
1082   - " WHERE C.YCY_STSTEM_ID= '"+hospitalId+"'";
  1090 + " B.HOME_ADDR,\n" +
  1091 + " B.STREET_VALLAGE_ID,\n" +
  1092 + " B.STREET_VALLAGE,\n" +
  1093 + " B.AREA_COUNTY_ID,\n" +
  1094 + " B.AREA_COUNTY,\n" +
  1095 + " B.CITY_ID,\n" +
  1096 + " B.CITY,\n" +
  1097 + " B.PROVINCE_ID,\n" +
  1098 + " B.PROVINCE\n" +
  1099 + "FROM ODS_F_AUXILIARY_EXAMI A\n" +
  1100 + "INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID\n" +
  1101 + "INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2\n" +
  1102 + "WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'";
  1103 + if (StringUtils.isNotEmpty(exDateStart))
  1104 + {
  1105 + sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')";
  1106 + }
  1107 + if (StringUtils.isNotEmpty(exDateEnd))
  1108 + {
  1109 + sql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')";
  1110 + }
  1111 +
  1112 + if (StringUtils.isNotEmpty(name))
  1113 + {
  1114 + sql += " AND A.NAME LIKE '%"+name+"%'";
  1115 + }
  1116 +
  1117 + if (weekStarts != null)
  1118 + {
  1119 + sql += " AND A.NOW_WEEKS>= "+weekStarts;
  1120 + }
  1121 +
  1122 + if (weekEnds != null)
  1123 + {
  1124 + sql += " AND A.NOW_WEEKS>= "+weekEnds;
  1125 + }
  1126 +
  1127 + if (StringUtils.isNotEmpty(hbsag))
  1128 + {
  1129 + sql += " AND A.HBSAG = "+hbsag;
  1130 + }
  1131 +
  1132 + if (StringUtils.isNotEmpty(hbeag))
  1133 + {
  1134 + sql += " AND A.HBEAG = "+hbeag;
  1135 + }
  1136 +
  1137 + if (StringUtils.isNotEmpty(hbeab))
  1138 + {
  1139 + sql += " AND A.HBEAB = "+hbeab;
  1140 + }
  1141 +
  1142 + if (StringUtils.isNotEmpty(hbcab))
  1143 + {
  1144 + sql += " AND A.HBCAB = "+hbcab;
  1145 + }
  1146 + if (StringUtils.isNotEmpty(syphilis))
  1147 + {
  1148 + sql += " AND A.SYPHILIS = "+syphilis;
  1149 + }
  1150 +
  1151 + if (StringUtils.isNotEmpty(hiv))
  1152 + {
  1153 + sql += " AND A.HIV = "+hiv;
  1154 + }
  1155 +
  1156 + if (StringUtils.isNotEmpty(hcv))
  1157 + {
  1158 + sql += " AND A.HCV = "+hcv;
  1159 + }
  1160 + if (StringUtils.isNotEmpty(doctorNo))
  1161 + {
  1162 + sql += " AND A.DOCTOR_NO = "+doctorNo;
  1163 + }
  1164 +
1083 1165 List<Map<String,Object>> list = JdbcUtil.getListDataBySql(sql);
1084 1166 BaseObjectResponse objectResponse = new BaseObjectResponse();
1085 1167 objectResponse.setData(list);