jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9e1f35b0826fd56a1f99773cf6d8085b0281a91f

Authored by jiangjiazhi
1 parent a658f7b0df
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

1

Showing 3 changed files with 72 additions and 73 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 9e1f35b
... ... @@ -101,7 +101,7 @@
101 101 private Date lastCTimeStart;
102 102 private Date lastCTimeEnd;
103 103 private Integer postViewTimes;
104   - private boolean gtePostTimes=false;
  104 + private boolean gtePostTimes = false;
105 105 //户籍地
106 106 private String provinceRegisterId;
107 107 private String cityRegisterId;
108 108  
... ... @@ -117,9 +117,10 @@
117 117 private List<String> hospitalList;
118 118  
119 119 //0 隐藏 1 显示
120   - private String enable="1";
  120 + private String enable = "1";
121 121  
122 122 private String notEnable;
  123 + private String notoRiskFactor;
123 124  
124 125 private Boolean extEnable;
125 126 //区域来源
... ... @@ -136,6 +137,14 @@
136 137 private Integer buildDaysStart;
137 138 private Integer buildDaysEnd;
138 139  
  140 + public String getNotoRiskFactor() {
  141 + return notoRiskFactor;
  142 + }
  143 +
  144 + public void setNotoRiskFactor(String notoRiskFactor) {
  145 + this.notoRiskFactor = notoRiskFactor;
  146 + }
  147 +
139 148 public Integer getBuildDaysStart() {
140 149 return buildDaysStart;
141 150 }
... ... @@ -381,7 +390,6 @@
381 390 private String cardNo;
382 391  
383 392  
384   -
385 393 private Date birth;
386 394 /**
387 395 * 就诊卡号
... ... @@ -487,7 +495,7 @@
487 495 private List<String> bookbuildingDoctorList;
488 496  
489 497 //档案编号
490   - private String fileCode;
  498 + private String fileCode;
491 499 // 分娩相关信息
492 500 // 分娩医院
493 501 private String fmHospital;
494 502  
... ... @@ -1054,13 +1062,11 @@
1054 1062 MongoCondition condition1 = mongoCondition.and("enable", enable, MongoOper.IS);
1055 1063 MongoCondition condition2 = MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN);
1056 1064 condition = condition.orCondition(new MongoCondition[]{condition1, condition2});
1057   - }
1058   - else if (null != smsBuildTypeList)
1059   - {
  1065 + } else if (null != smsBuildTypeList) {
1060 1066 condition = condition.and("buildType", smsBuildTypeList, MongoOper.IN);
1061 1067 }
1062   - if(null!=extEnable){
1063   - List list=new ArrayList();
  1068 + if (null != extEnable) {
  1069 + List list = new ArrayList();
1064 1070 list.add("1");
1065 1071 list.add("2");
1066 1072 condition = condition.and("enable", list, MongoOper.NIN);
1067 1073  
... ... @@ -1070,11 +1076,11 @@
1070 1076 condition = condition.and("buildType", buildTypeEq, MongoOper.IS);
1071 1077 }
1072 1078  
1073   - if(buildTypeNot!=-1){
  1079 + if (buildTypeNot != -1) {
1074 1080 condition = condition.and("buildType", buildTypeNot, MongoOper.NE);
1075 1081 }
1076 1082  
1077   - if(pcerteTypeId != null){
  1083 + if (pcerteTypeId != null) {
1078 1084 condition = condition.and("pcerteTypeId", pcerteTypeId, MongoOper.IS);
1079 1085 }
1080 1086  
1081 1087  
1082 1088  
1083 1089  
1084 1090  
1085 1091  
1086 1092  
... ... @@ -1100,26 +1106,26 @@
1100 1106 if (StringUtils.isNotEmpty(areaId)) {
1101 1107 condition = condition.and("areaId", areaId, MongoOper.IS);
1102 1108 }
1103   - if(StringUtils.isNotEmpty(cityId)){
  1109 + if (StringUtils.isNotEmpty(cityId)) {
1104 1110 condition = condition.and("cityId", cityId, MongoOper.IS);
1105 1111 }
1106   - if(StringUtils.isNotEmpty(provinceId)){
  1112 + if (StringUtils.isNotEmpty(provinceId)) {
1107 1113 condition = condition.and("provinceId", provinceId, MongoOper.IS);
1108 1114 }
1109   - if(StringUtils.isNotEmpty(streetId)){
  1115 + if (StringUtils.isNotEmpty(streetId)) {
1110 1116 condition = condition.and("streetId", streetId, MongoOper.IS);
1111 1117 }
1112 1118 //户籍地
1113   - if(StringUtils.isNotEmpty(provinceRegisterId)){
  1119 + if (StringUtils.isNotEmpty(provinceRegisterId)) {
1114 1120 condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS);
1115 1121 }
1116   - if(StringUtils.isNotEmpty(cityRegisterId)){
  1122 + if (StringUtils.isNotEmpty(cityRegisterId)) {
1117 1123 condition = condition.and("cityRegisterId", cityRegisterId, MongoOper.IS);
1118 1124 }
1119   - if(StringUtils.isNotEmpty(areaRegisterId)){
  1125 + if (StringUtils.isNotEmpty(areaRegisterId)) {
1120 1126 condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS);
1121 1127 }
1122   - if(StringUtils.isNotEmpty(streetRegisterId)){
  1128 + if (StringUtils.isNotEmpty(streetRegisterId)) {
1123 1129 condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS);
1124 1130 }
1125 1131  
... ... @@ -1139,8 +1145,6 @@
1139 1145 private List<String> hospitalList;*/
1140 1146  
1141 1147  
1142   -
1143   -
1144 1148 if (StringUtils.isNotEmpty(id)) {
1145 1149 condition = condition.and("id", id, MongoOper.IS);
1146 1150 }
... ... @@ -1169,7 +1173,7 @@
1169 1173 } else if (null != likeName) {
1170 1174 condition = condition.and("username", likeName, MongoOper.LIKE);
1171 1175 }
1172   - if(CollectionUtils.isNotEmpty(hospitalList)){
  1176 + if (CollectionUtils.isNotEmpty(hospitalList)) {
1173 1177 condition = condition.and("hospitalId", hospitalList, MongoOper.IN);
1174 1178 }
1175 1179 if (null != hospitalId) {
1176 1180  
1177 1181  
1178 1182  
1179 1183  
... ... @@ -1185,24 +1189,24 @@
1185 1189  
1186 1190 if (null != queryNo) {
1187 1191 MongoCondition c = MongoCondition.newInstance();
1188   - MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
  1192 + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
1189 1193 MongoCondition con2 = MongoCondition.newInstance("username", "^" + queryNo, MongoOper.LIKE);
1190 1194 MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
1191 1195 MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS);
1192 1196 MongoCondition con5 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS);
1193   - if(c1!=null) {
1194   - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4,con5}).getCriteria());
1195   - }else {
1196   - c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4,con5}).getCriteria();
  1197 + if (c1 != null) {
  1198 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria());
  1199 + } else {
  1200 + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria();
1197 1201 }
1198 1202 }
1199 1203 if (null != phoneOrCert) {
1200 1204 MongoCondition c = MongoCondition.newInstance();
1201   - MongoCondition con1 = MongoCondition.newInstance("phone", phoneOrCert, MongoOper.IS);
  1205 + MongoCondition con1 = MongoCondition.newInstance("phone", phoneOrCert, MongoOper.IS);
1202 1206 MongoCondition con2 = MongoCondition.newInstance("cardNo", phoneOrCert, MongoOper.IS);
1203   - if(c1!=null) {
  1207 + if (c1 != null) {
1204 1208 c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
1205   - }else {
  1209 + } else {
1206 1210 c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
1207 1211 }
1208 1212 }
1209 1213  
1210 1214  
1211 1215  
1212 1216  
1213 1217  
1214 1218  
... ... @@ -1210,33 +1214,28 @@
1210 1214  
1211 1215 if (null != pc) {
1212 1216 MongoCondition c = MongoCondition.newInstance();
1213   - MongoCondition con1 = MongoCondition.newInstance("phone", pc[0], MongoOper.IS);
  1217 + MongoCondition con1 = MongoCondition.newInstance("phone", pc[0], MongoOper.IS);
1214 1218 MongoCondition con2 = MongoCondition.newInstance("cardNo", pc[1], MongoOper.IS);
1215   - if(c1!=null) {
  1219 + if (c1 != null) {
1216 1220 c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
1217   - }else {
  1221 + } else {
1218 1222 c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
1219 1223 }
1220 1224 }
1221 1225  
1222 1226 if (null != pv) {
1223 1227  
1224   - if (StringUtils.isNotEmpty(pv[0]) && StringUtils.isNotEmpty(pv[1]) && StringUtils.isNotEmpty(pv[2]))
1225   - {
  1228 + if (StringUtils.isNotEmpty(pv[0]) && StringUtils.isNotEmpty(pv[1]) && StringUtils.isNotEmpty(pv[2])) {
1226 1229 MongoCondition con1 = MongoCondition.newInstance("phone", pv[0], MongoOper.IS);
1227 1230 MongoCondition con2 = MongoCondition.newInstance("vcCardNo", pv[1], MongoOper.IS);
1228 1231 MongoCondition con3 = MongoCondition.newInstance("cardNo", pv[2], MongoOper.IS);
1229   - condition = condition.orCondition(new MongoCondition[]{con1, con2,con3});
1230   - }
1231   - else
1232   - {
  1232 + condition = condition.orCondition(new MongoCondition[]{con1, con2, con3});
  1233 + } else {
1233 1234 if (StringUtils.isNotEmpty(pv[1])) {
1234 1235 condition = condition.and("vcCardNo", pv[1], MongoOper.IS);
1235   - }
1236   - else if (StringUtils.isNotEmpty(pv[2])) {
  1236 + } else if (StringUtils.isNotEmpty(pv[2])) {
1237 1237 condition = condition.and("cardNo", pv[2], MongoOper.IS);
1238   - }
1239   - else if (StringUtils.isNotEmpty(pv[0])) {
  1238 + } else if (StringUtils.isNotEmpty(pv[0])) {
1240 1239 condition = condition.and("phone", pv[0], MongoOper.IS);
1241 1240 }
1242 1241 }
1243 1242  
1244 1243  
... ... @@ -1244,11 +1243,11 @@
1244 1243  
1245 1244 if (CollectionUtils.isNotEmpty(fmHospitalQueryList)) {
1246 1245 MongoCondition c = MongoCondition.newInstance();
1247   - MongoCondition con1 = MongoCondition.newInstance("hospitalId", fmHospitalQueryList, MongoOper.IN);
  1246 + MongoCondition con1 = MongoCondition.newInstance("hospitalId", fmHospitalQueryList, MongoOper.IN);
1248 1247 MongoCondition con2 = MongoCondition.newInstance("fmHospital", fmHospitalQueryList, MongoOper.IN);
1249   - if(c1!=null) {
  1248 + if (c1 != null) {
1250 1249 c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
1251   - }else{
  1250 + } else {
1252 1251 c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
1253 1252 }
1254 1253 }
1255 1254  
1256 1255  
1257 1256  
... ... @@ -1259,21 +1258,20 @@
1259 1258  
1260 1259 if (lastCheckEmployeeId != null) {
1261 1260 condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS);
1262   - }
1263   - else if(lastCheckEId){
  1261 + } else if (lastCheckEId) {
1264 1262 condition = condition.and("lastCheckEmployeeId", "", MongoOper.NE);
1265 1263 MongoCondition c = MongoCondition.newInstance();
1266   - if(c1!=null){
1267   - c1= c1.andOperator(c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria());
1268   - }else {
  1264 + if (c1 != null) {
  1265 + c1 = c1.andOperator(c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria());
  1266 + } else {
1269 1267 c1 = c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria();
1270 1268 }
1271 1269 }
1272 1270  
1273 1271 if (fmDateStart != null && fmDateEnd != null) {
1274   - if(c1!=null){
  1272 + if (c1 != null) {
1275 1273 c1 = c1.and("fmDate").gte(fmDateStart).lte(fmDateEnd);
1276   - }else {
  1274 + } else {
1277 1275 c1 = Criteria.where("fmDate").gte(fmDateStart).lte(fmDateEnd);
1278 1276 }
1279 1277 }
... ... @@ -1281,7 +1279,7 @@
1281 1279 if (null != serviceType) {
1282 1280 condition = condition.and("serviceType", serviceType, MongoOper.IS);
1283 1281 }
1284   - if(null!=source){
  1282 + if (null != source) {
1285 1283 condition = condition.and("source", source, MongoOper.IS);
1286 1284 }
1287 1285  
1288 1286  
1289 1287  
1290 1288  
... ... @@ -1311,16 +1309,15 @@
1311 1309  
1312 1310 if (StringUtils.isNotEmpty(rFactor)) {
1313 1311 condition = condition.and("riskFactorId", rFactor, MongoOper.IN);
1314   - }
1315   - else if(norFactor){
1316   - condition = condition.and("riskFactorId", new ArrayList<String>(), MongoOper.NE);
  1312 + } else if (norFactor) {
  1313 + condition = condition.and("riskFactorId", new ArrayList<String>(), MongoOper.NE);
1317 1314 MongoCondition c = MongoCondition.newInstance();
1318   - if(c1!=null){
  1315 + if (c1 != null) {
1319 1316 c1 = c1.andOperator(c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria());
1320   - }else {
  1317 + } else {
1321 1318 c1 = c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria();
1322 1319 }
1323   - }else if(null!=rFactorList &&!rFactorList.isEmpty()){
  1320 + } else if (null != rFactorList && !rFactorList.isEmpty()) {
1324 1321 condition = condition.and("riskFactorId", rFactorList, MongoOper.IN);
1325 1322 }
1326 1323 if (-1 != yn) {
1327 1324  
1328 1325  
... ... @@ -1336,13 +1333,13 @@
1336 1333 if (type != null && -1 != type) {
1337 1334 condition = condition.and("type", type, MongoOper.IS);
1338 1335 }
1339   - if(typeList!=null&&typeList.size()>0){
1340   - condition = condition.and("type",typeList,MongoOper.IN);
  1336 + if (typeList != null && typeList.size() > 0) {
  1337 + condition = condition.and("type", typeList, MongoOper.IN);
1341 1338 }
1342   - if(null!=postViewTimes){
1343   - if(gtePostTimes){
  1339 + if (null != postViewTimes) {
  1340 + if (gtePostTimes) {
1344 1341 condition = condition.and("postViewTimes", postViewTimes, MongoOper.GTE);
1345   - }else{
  1342 + } else {
1346 1343 condition = condition.and("postViewTimes", postViewTimes, MongoOper.IS);
1347 1344 }
1348 1345 }
1349 1346  
... ... @@ -1448,12 +1445,12 @@
1448 1445 }
1449 1446 }
1450 1447 if (null != gteModified && null != gteCreated) {
1451   - MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE);
  1448 + MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE);
1452 1449 MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE);
1453 1450 condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2});
1454 1451 }
1455 1452  
1456   - if(null != lastCTimeStart){
  1453 + if (null != lastCTimeStart) {
1457 1454 if (null != c1) {
1458 1455 c1 = c1.and("lastCTime").gte(lastCTimeStart);
1459 1456 } else {
... ... @@ -1507,7 +1504,7 @@
1507 1504 }
1508 1505 boolean isBirthStart = false;
1509 1506 if (null != birthStart) {
1510   - isBirthStart = true;
  1507 + isBirthStart = true;
1511 1508 if (null != c1) {
1512 1509 c1 = c1.and("birth").gte(birthStart);
1513 1510 } else {
1514 1511  
... ... @@ -1517,12 +1514,9 @@
1517 1514  
1518 1515 if (null != birthEnd) {
1519 1516 if (null != c1) {
1520   - if (isBirthStart)
1521   - {
  1517 + if (isBirthStart) {
1522 1518 c1 = c1.lte(birthEnd);
1523   - }
1524   - else
1525   - {
  1519 + } else {
1526 1520 c1 = c1.and("birth").lte(birthEnd);
1527 1521 }
1528 1522  
... ... @@ -1578,6 +1572,9 @@
1578 1572 c1 = Criteria.where("oRiskFactor").exists(true);
1579 1573 }
1580 1574 }
  1575 + if (null != notEnable) {
  1576 + condition = condition.and("oRiskFactor", notEnable, MongoOper.NE);
  1577 + }
1581 1578  
1582 1579  
1583 1580 if (null != c1) {
... ... @@ -1587,6 +1584,7 @@
1587 1584  
1588 1585 return condition.toMongoQuery();
1589 1586 }
  1587 +
1590 1588 public Integer gethScoreEnd() {
1591 1589 return hScoreEnd;
1592 1590 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 9e1f35b
... ... @@ -254,6 +254,7 @@
254 254  
255 255 //高危统计中的自定义高危
256 256 if ("otherRiskId".equals(riskPatientsQueryRequest.getrFacotr())) {
  257 + patientsQuery.setNotoRiskFactor("");
257 258 patientsQuery.setoRiskFactor("true");
258 259 } else {
259 260 patientsQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(riskPatientsQueryRequest.getrFacotr(), String.class));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 9e1f35b
... ... @@ -152,8 +152,8 @@
152 152  
153 153 query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart());
154 154 query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd());
  155 + query.setNotoRiskFactor("");
155 156 query.setoRiskFactor("true");
156   -
157 157 query.setType(patientsQuery.getType());
158 158  
159 159 //单个高危因素孕产妇条数