Commit b64e1c980cda37fa399299fa78545f8d375991ca
1 parent
e303925ed4
Exists in
master
and in
8 other branches
code update
Showing 1 changed file with 89 additions and 89 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
b64e1c9
| ... | ... | @@ -114,7 +114,7 @@ |
| 114 | 114 | if (yunRequest.getPregnantCertificateNum() != null) |
| 115 | 115 | { |
| 116 | 116 | patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum()); |
| 117 | - //判断该身份证号码是否有孕妇建档 在该医院 | |
| 117 | + //判断该身份证号码是否有孕妇建档 在该医院 | |
| 118 | 118 | List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| 119 | 119 | if (CollectionUtils.isNotEmpty(patients)) |
| 120 | 120 | { |
| ... | ... | @@ -159,7 +159,7 @@ |
| 159 | 159 | Date date = null; |
| 160 | 160 | if (yunRequest.getLastMenstrualPeriod() != null) |
| 161 | 161 | { |
| 162 | - date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42); | |
| 162 | + date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42); | |
| 163 | 163 | Date currentDate = DateUtil.formatDate(new Date()); |
| 164 | 164 | if (date.getTime() <= currentDate.getTime()) |
| 165 | 165 | { |
| ... | ... | @@ -238,7 +238,7 @@ |
| 238 | 238 | |
| 239 | 239 | if (type == ServiceObjEnums.YUNOBJ.getId()) |
| 240 | 240 | { |
| 241 | - //生成建档短信 | |
| 241 | + //生成建档短信 | |
| 242 | 242 | createBuildSms(p); |
| 243 | 243 | } |
| 244 | 244 | |
| ... | ... | @@ -246,7 +246,7 @@ |
| 246 | 246 | br.setErrormsg("成功"); |
| 247 | 247 | br.setData(p.getId()); |
| 248 | 248 | return br; |
| 249 | - | |
| 249 | + | |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /** |
| ... | ... | @@ -311,7 +311,7 @@ |
| 311 | 311 | sendList.add(temp); |
| 312 | 312 | } |
| 313 | 313 | } |
| 314 | - else if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) | |
| 314 | + else if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) | |
| 315 | 315 | { |
| 316 | 316 | sendList.add(temp); |
| 317 | 317 | } |
| ... | ... | @@ -320,7 +320,7 @@ |
| 320 | 320 | if (CollectionUtils.isNotEmpty(sendList)) |
| 321 | 321 | { |
| 322 | 322 | |
| 323 | - //短信前缀 | |
| 323 | + //短信前缀 | |
| 324 | 324 | String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, patient.getBookbuildingDoctor()); |
| 325 | 325 | for (SmsTemplateModel templateModel : sendList) |
| 326 | 326 | { |
| ... | ... | @@ -477,7 +477,7 @@ |
| 477 | 477 | personService.updatePerson(pmodel, yunRequest.getPid()); |
| 478 | 478 | } |
| 479 | 479 | patient.setId(id); |
| 480 | - //加入产筛 | |
| 480 | + //加入产筛 | |
| 481 | 481 | patientsService.validata(patient); |
| 482 | 482 | |
| 483 | 483 | |
| ... | ... | @@ -525,7 +525,7 @@ |
| 525 | 525 | if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) |
| 526 | 526 | { |
| 527 | 527 | patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo()); |
| 528 | - patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC); | |
| 528 | + patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC); | |
| 529 | 529 | } |
| 530 | 530 | //否则用就诊卡号 查询到这个孕妇的身份证号码 再用身份证号码查询该孕妇的所有建档 包括产妇记录 |
| 531 | 531 | else if (!StringUtils.isEmpty(bookbuildingQueryRequest.getVcCardNo())) |
| ... | ... | @@ -944,7 +944,7 @@ |
| 944 | 944 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 945 | 945 | antExChuQuery.setParentId(id); |
| 946 | 946 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 947 | - //获取初诊记录 | |
| 947 | + //获取初诊记录 | |
| 948 | 948 | List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 949 | 949 | String hospital = autoMatchFacade.getHospitalId(userId); |
| 950 | 950 | Patients patients = yunBookbuildingService.findOneById(id); |
| ... | ... | @@ -1056,20 +1056,20 @@ |
| 1056 | 1056 | } |
| 1057 | 1057 | |
| 1058 | 1058 | public BaseListResponse queryChanJianReport(Integer userId, String exDateStart, |
| 1059 | - String exDateEnd, | |
| 1060 | - String name, | |
| 1061 | - Integer weekStarts, | |
| 1062 | - Integer weekEnds, | |
| 1063 | - String hbsag, | |
| 1064 | - String hbeag, | |
| 1065 | - String hbeab, | |
| 1066 | - String hbcab, | |
| 1067 | - String syphilis, | |
| 1068 | - String hiv, | |
| 1069 | - String hcv, | |
| 1070 | - String doctorNo, | |
| 1071 | - Integer page, | |
| 1072 | - Integer limit) { | |
| 1059 | + String exDateEnd, | |
| 1060 | + String name, | |
| 1061 | + Integer weekStarts, | |
| 1062 | + Integer weekEnds, | |
| 1063 | + String hbsag, | |
| 1064 | + String hbeag, | |
| 1065 | + String hbeab, | |
| 1066 | + String hbcab, | |
| 1067 | + String syphilis, | |
| 1068 | + String hiv, | |
| 1069 | + String hcv, | |
| 1070 | + String doctorNo, | |
| 1071 | + Integer page, | |
| 1072 | + Integer limit) { | |
| 1073 | 1073 | |
| 1074 | 1074 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 1075 | 1075 | |
| 1076 | 1076 | |
| 1077 | 1077 | |
| 1078 | 1078 | |
| 1079 | 1079 | |
| 1080 | 1080 | |
| 1081 | 1081 | |
| 1082 | 1082 | |
| 1083 | 1083 | |
| 1084 | 1084 | |
| 1085 | 1085 | |
| ... | ... | @@ -1123,82 +1123,82 @@ |
| 1123 | 1123 | " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID \n" + |
| 1124 | 1124 | " INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2 \n" + |
| 1125 | 1125 | " WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'"; |
| 1126 | - if (StringUtils.isNotEmpty(exDateStart)) | |
| 1127 | - { | |
| 1128 | - sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')"; | |
| 1129 | - countSql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')"; | |
| 1130 | - } | |
| 1131 | - if (StringUtils.isNotEmpty(exDateEnd)) | |
| 1132 | - { | |
| 1133 | - sql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')"; | |
| 1134 | - countSql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')"; | |
| 1135 | - } | |
| 1126 | + if (StringUtils.isNotEmpty(exDateStart)) | |
| 1127 | + { | |
| 1128 | + sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')"; | |
| 1129 | + countSql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')"; | |
| 1130 | + } | |
| 1131 | + if (StringUtils.isNotEmpty(exDateEnd)) | |
| 1132 | + { | |
| 1133 | + sql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')"; | |
| 1134 | + countSql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')"; | |
| 1135 | + } | |
| 1136 | 1136 | |
| 1137 | - if (StringUtils.isNotEmpty(name)) | |
| 1138 | - { | |
| 1139 | - sql += " AND A.NAME LIKE '%"+name+"%'"; | |
| 1140 | - countSql += " AND A.NAME LIKE '%"+name+"%'"; | |
| 1141 | - } | |
| 1137 | + if (StringUtils.isNotEmpty(name)) | |
| 1138 | + { | |
| 1139 | + sql += " AND A.NAME LIKE '%"+name+"%'"; | |
| 1140 | + countSql += " AND A.NAME LIKE '%"+name+"%'"; | |
| 1141 | + } | |
| 1142 | 1142 | |
| 1143 | - if (weekStarts != null) | |
| 1144 | - { | |
| 1145 | - sql += " AND A.NOW_WEEKS>= "+weekStarts; | |
| 1146 | - countSql += " AND A.NOW_WEEKS>= "+weekStarts; | |
| 1147 | - } | |
| 1143 | + if (weekStarts != null) | |
| 1144 | + { | |
| 1145 | + sql += " AND A.NOW_WEEKS>= "+weekStarts; | |
| 1146 | + countSql += " AND A.NOW_WEEKS>= "+weekStarts; | |
| 1147 | + } | |
| 1148 | 1148 | |
| 1149 | - if (weekEnds != null) | |
| 1150 | - { | |
| 1151 | - sql += " AND A.NOW_WEEKS <= "+weekEnds; | |
| 1152 | - countSql += " AND A.NOW_WEEKS <= "+weekEnds; | |
| 1153 | - } | |
| 1149 | + if (weekEnds != null) | |
| 1150 | + { | |
| 1151 | + sql += " AND A.NOW_WEEKS <= "+weekEnds; | |
| 1152 | + countSql += " AND A.NOW_WEEKS <= "+weekEnds; | |
| 1153 | + } | |
| 1154 | 1154 | |
| 1155 | - if (StringUtils.isNotEmpty(hbsag)) | |
| 1156 | - { | |
| 1157 | - sql += " AND A.HBSAG = "+hbsag; | |
| 1158 | - countSql += " AND A.HBSAG = "+hbsag; | |
| 1159 | - } | |
| 1155 | + if (StringUtils.isNotEmpty(hbsag)) | |
| 1156 | + { | |
| 1157 | + sql += " AND A.HBSAG = "+hbsag; | |
| 1158 | + countSql += " AND A.HBSAG = "+hbsag; | |
| 1159 | + } | |
| 1160 | 1160 | |
| 1161 | - if (StringUtils.isNotEmpty(hbeag)) | |
| 1162 | - { | |
| 1163 | - sql += " AND A.HBEAG = "+hbeag; | |
| 1164 | - countSql += " AND A.HBEAG = "+hbeag; | |
| 1165 | - } | |
| 1161 | + if (StringUtils.isNotEmpty(hbeag)) | |
| 1162 | + { | |
| 1163 | + sql += " AND A.HBEAG = "+hbeag; | |
| 1164 | + countSql += " AND A.HBEAG = "+hbeag; | |
| 1165 | + } | |
| 1166 | 1166 | |
| 1167 | - if (StringUtils.isNotEmpty(hbeab)) | |
| 1168 | - { | |
| 1169 | - sql += " AND A.HBEAB = "+hbeab; | |
| 1170 | - countSql += " AND A.HBEAB = "+hbeab; | |
| 1171 | - } | |
| 1167 | + if (StringUtils.isNotEmpty(hbeab)) | |
| 1168 | + { | |
| 1169 | + sql += " AND A.HBEAB = "+hbeab; | |
| 1170 | + countSql += " AND A.HBEAB = "+hbeab; | |
| 1171 | + } | |
| 1172 | 1172 | |
| 1173 | - if (StringUtils.isNotEmpty(hbcab)) | |
| 1174 | - { | |
| 1175 | - sql += " AND A.HBCAB = "+hbcab; | |
| 1176 | - countSql += " AND A.HBCAB = "+hbcab; | |
| 1177 | - } | |
| 1178 | - if (StringUtils.isNotEmpty(syphilis)) | |
| 1179 | - { | |
| 1180 | - sql += " AND A.SYPHILIS = "+syphilis; | |
| 1181 | - countSql += " AND A.SYPHILIS = "+syphilis; | |
| 1182 | - } | |
| 1173 | + if (StringUtils.isNotEmpty(hbcab)) | |
| 1174 | + { | |
| 1175 | + sql += " AND A.HBCAB = "+hbcab; | |
| 1176 | + countSql += " AND A.HBCAB = "+hbcab; | |
| 1177 | + } | |
| 1178 | + if (StringUtils.isNotEmpty(syphilis)) | |
| 1179 | + { | |
| 1180 | + sql += " AND A.SYPHILIS = "+syphilis; | |
| 1181 | + countSql += " AND A.SYPHILIS = "+syphilis; | |
| 1182 | + } | |
| 1183 | 1183 | |
| 1184 | - if (StringUtils.isNotEmpty(hiv)) | |
| 1185 | - { | |
| 1186 | - sql += " AND A.HIV = "+hiv; | |
| 1187 | - countSql += " AND A.HIV = "+hiv; | |
| 1188 | - } | |
| 1184 | + if (StringUtils.isNotEmpty(hiv)) | |
| 1185 | + { | |
| 1186 | + sql += " AND A.HIV = "+hiv; | |
| 1187 | + countSql += " AND A.HIV = "+hiv; | |
| 1188 | + } | |
| 1189 | 1189 | |
| 1190 | - if (StringUtils.isNotEmpty(hcv)) | |
| 1191 | - { | |
| 1192 | - sql += " AND A.HCV = "+hcv; | |
| 1193 | - countSql += " AND A.HCV = "+hcv; | |
| 1194 | - } | |
| 1195 | - if (StringUtils.isNotEmpty(doctorNo)) | |
| 1196 | - { | |
| 1197 | - sql += " AND A.DOCTOR_NO = "+doctorNo; | |
| 1198 | - countSql += " AND A.DOCTOR_NO = "+doctorNo; | |
| 1199 | - } | |
| 1190 | + if (StringUtils.isNotEmpty(hcv)) | |
| 1191 | + { | |
| 1192 | + sql += " AND A.HCV = "+hcv; | |
| 1193 | + countSql += " AND A.HCV = "+hcv; | |
| 1194 | + } | |
| 1195 | + if (StringUtils.isNotEmpty(doctorNo)) | |
| 1196 | + { | |
| 1197 | + sql += " AND A.DOCTOR_NO = "+doctorNo; | |
| 1198 | + countSql += " AND A.DOCTOR_NO = "+doctorNo; | |
| 1199 | + } | |
| 1200 | 1200 | |
| 1201 | - sql+=" order by A.EXAMINE_DATE DESC,A.Name ASC,A.EXAMINE_ID DESC ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start; | |
| 1201 | + sql+=" order by A.EXAMINE_DATE DESC,A.Name ASC,A.EXAMINE_ID DESC ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start; | |
| 1202 | 1202 | |
| 1203 | 1203 | logger.info(sql); |
| 1204 | 1204 | List<Map<String,Object>> list = JdbcUtil.getListDataBySql(sql); |