jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a986dbb822cb2e7b8493c1874d70e657085127ca

Authored by zhangchao
2 parents 7ef64d5738 4d46fe8684
Exists in dev

Merge branch 'dev' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform into dev

Showing 20 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReviewDao.java View file @ a986dbb
... ... @@ -11,5 +11,9 @@
11 11 void reviewAdd(ReviewModel reviewModel);
12 12  
13 13 List<ReviewModel> reviewQuery1List(MongoQuery created);
  14 +
  15 + List<ReviewModel> reviewList(MongoQuery created);
  16 +
  17 + void reviewUpdate(MongoQuery id, ReviewModel reviewModel);
14 18 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReviewDaoImpl.java View file @ a986dbb
... ... @@ -24,5 +24,15 @@
24 24 public List<ReviewModel> reviewQuery1List(MongoQuery created) {
25 25 return find(created.convertToMongoQuery());
26 26 }
  27 +
  28 + @Override
  29 + public List<ReviewModel> reviewList(MongoQuery created) {
  30 + return find(created.convertToMongoQuery());
  31 + }
  32 +
  33 + @Override
  34 + public void reviewUpdate(MongoQuery id, ReviewModel reviewModel) {
  35 + update(id.convertToMongoQuery(),reviewModel);
  36 + }
27 37 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseEvalService.java View file @ a986dbb
... ... @@ -99,7 +99,7 @@
99 99 reviewQuery.mysqlBuild(msgDao.queryMsgListCount(reviewQuery.convertToQuery()));
100 100 query.start(reviewQuery.getOffset()).end(reviewQuery.getLimit());
101 101 }
102   - return reviewDao.queryMsgList(query.addOrder(Sort.Direction.DESC, "created"));
  102 + return reviewDao.reviewList(query.addOrder(Sort.Direction.DESC, "created"));
103 103 }
104 104  
105 105 public void reviewAdd(ReviewModel reviewModel) {
... ... @@ -113,6 +113,10 @@
113 113 query.start(reviewQuery1.getOffset()).end(reviewQuery1.getLimit());
114 114 }
115 115 return reviewDao.reviewQuery1List(query.addOrder(Sort.Direction.DESC, "created"));
  116 + }
  117 +
  118 + public void reviewUpdate(ReviewModel reviewModel) {
  119 + reviewDao.reviewUpdate(new MongoQuery(new MongoCondition("id", reviewModel.getId(), MongoOper.IS)), reviewModel);
116 120 }
117 121 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ a986dbb
... ... @@ -126,7 +126,7 @@
126 126 patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
127 127 query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());
128 128 }
129   -
  129 + System.out.println(query.convertToMongoQuery());
130 130 return iPatientDao.queryPatient(query.addOrder(Sort.Direction.fromString(sort), field));
131 131 }
132 132  
platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java View file @ a986dbb
... ... @@ -26,6 +26,7 @@
26 26 NIN,
27 27 IN,
28 28 //判断集合是否为空
29   - SIZE;
  29 + SIZE,
  30 + OR;
30 31 }
platform-dal/src/main/java/com/lyms/platform/pojo/CourseTypeModel.java View file @ a986dbb
... ... @@ -42,6 +42,16 @@
42 42 //平均分数
43 43 private Integer avg;
44 44  
  45 + private String courseVideo;
  46 +
  47 + public String getCourseVideo() {
  48 + return courseVideo;
  49 + }
  50 +
  51 + public void setCourseVideo(String courseVideo) {
  52 + this.courseVideo = courseVideo;
  53 + }
  54 +
45 55 public Integer getScore() {
46 56 return score;
47 57 }
platform-dal/src/main/java/com/lyms/platform/pojo/MsgModel.java View file @ a986dbb
... ... @@ -34,7 +34,7 @@
34 34 private Integer state;
35 35 //
36 36 private Integer oarentId;
37   - //标题0.医生停诊通知 1.检查停诊通知 2.医院放假通知
  37 + //标题0.医生停诊通知 1.检查停诊通知 2.医院放假通知 3.排课表
38 38 private Integer title;
39 39  
40 40 private String hospitalId;
platform-dal/src/main/java/com/lyms/platform/pojo/ReviewModel.java View file @ a986dbb
... ... @@ -26,6 +26,25 @@
26 26 //是
27 27 private Integer yn;
28 28  
  29 + private Integer state;
  30 +
  31 + private String createByName;
  32 +
  33 + public String getCreateByName() {
  34 + return createByName;
  35 + }
  36 +
  37 + public void setCreateByName(String createByName) {
  38 + this.createByName = createByName;
  39 + }
  40 +
  41 + public Integer getState() {
  42 + return state;
  43 + }
  44 +
  45 + public void setState(Integer state) {
  46 + this.state = state;
  47 + }
29 48  
30 49 public Integer getYn() {
31 50 return yn;
platform-dal/src/main/java/com/lyms/platform/query/CourseTypeQuery.java View file @ a986dbb
... ... @@ -34,6 +34,16 @@
34 34  
35 35 private Integer yn;
36 36  
  37 + private String courseVideo;
  38 +
  39 + public String getCourseVideo() {
  40 + return courseVideo;
  41 + }
  42 +
  43 + public void setCourseVideo(String courseVideo) {
  44 + this.courseVideo = courseVideo;
  45 + }
  46 +
37 47 @Override
38 48 public MongoQuery convertToQuery() {
39 49 MongoCondition condition = MongoCondition.newInstance();
... ... @@ -64,7 +74,9 @@
64 74 if (null != yn) {
65 75 condition = condition.and("yn", yn, MongoOper.IS);
66 76 }
67   -
  77 + if (null != courseVideo) {
  78 + condition = condition.and("courseVideo", courseVideo, MongoOper.IS);
  79 + }
68 80 return condition.toMongoQuery();
69 81 }
70 82  
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ a986dbb
... ... @@ -262,6 +262,12 @@
262 262 private List<String> rFactorList;
263 263  
264 264  
  265 + /**
  266 + * 高危因素甲减集合
  267 + */
  268 + private List<String> jFactorList;
  269 +
  270 +
265 271 private boolean norFactor;
266 272  
267 273 //国家高危因数为空集合
... ... @@ -1240,6 +1246,8 @@
1240 1246 }
1241 1247 } else if (null != rFactorList && !rFactorList.isEmpty()) {
1242 1248 condition = condition.and("riskFactorId", rFactorList, MongoOper.IN);
  1249 + }else if (null != jFactorList && !jFactorList.isEmpty()) {
  1250 + condition = condition.and("riskFactorId", jFactorList,MongoOper.OR);
1243 1251 }
1244 1252  
1245 1253 if (isNullrFactor) {
1246 1254  
... ... @@ -1660,7 +1668,13 @@
1660 1668 public void setrFactorList(List<String> rFactorList) {
1661 1669 this.rFactorList = rFactorList;
1662 1670 }
  1671 + public List<String> getjFactorList() {
  1672 + return jFactorList;
  1673 + }
1663 1674  
  1675 + public void setjFactorList(List<String> jFactorList) {
  1676 + this.jFactorList = jFactorList;
  1677 + }
1664 1678 public Date getCreatedTimeEnd() {
1665 1679 return createdTimeEnd;
1666 1680 }
... ... @@ -2490,7 +2504,6 @@
2490 2504 public Integer getFmAgeEnd() {
2491 2505 return fmAgeEnd;
2492 2506 }
2493   -
2494 2507 public void setFmAgeEnd(Integer fmAgeEnd) {
2495 2508 this.fmAgeEnd = fmAgeEnd;
2496 2509 }
platform-dal/src/main/java/com/lyms/platform/query/ReviewQuery.java View file @ a986dbb
... ... @@ -25,6 +25,26 @@
25 25 //课程id
26 26 private String couresId;
27 27  
  28 + private Integer state;
  29 +
  30 + private String createByName;
  31 +
  32 + public String getCreateByName() {
  33 + return createByName;
  34 + }
  35 +
  36 + public void setCreateByName(String createByName) {
  37 + this.createByName = createByName;
  38 + }
  39 +
  40 + public Integer getState() {
  41 + return state;
  42 + }
  43 +
  44 + public void setState(Integer state) {
  45 + this.state = state;
  46 + }
  47 +
28 48 //yn
29 49 private Integer yn;
30 50  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java View file @ a986dbb
... ... @@ -428,12 +428,11 @@
428 428 * */
429 429 @RequestMapping(method = RequestMethod.GET, value = "/reviewUserList")
430 430 @ResponseBody
431   - @TokenRequired
432 431 public BaseResponse reviewUserList(
433 432 @RequestParam(required = false) String couresId,
434   - @RequestParam(required = false) String id,
  433 + @RequestParam(required = false) String reviewId,
435 434 HttpServletRequest request) {
436   - return courseFacade.reviewUserList(couresId,id,getUserId(request));
  435 + return courseFacade.reviewUserList(couresId,reviewId);
437 436 }
438 437  
439 438 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ a986dbb
... ... @@ -320,7 +320,7 @@
320 320 @TokenRequired
321 321 public BaseResponse queryHypothyroidismAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) {
322 322 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
323   - return patientFacade.queryhypothyroidismAllPuerpera(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.FALSE);
  323 + return patientFacade.queryHypothyroidismAllPuerpera(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.FALSE);
324 324 }
325 325  
326 326 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ a986dbb
... ... @@ -1179,6 +1179,8 @@
1179 1179  
1180 1180  
1181 1181 courseEvalService.updateMsg(model);
  1182 +
  1183 +
1182 1184 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1183 1185 objectResponse.setErrormsg("成功");
1184 1186 return objectResponse;
1185 1187  
1186 1188  
... ... @@ -1292,15 +1294,28 @@
1292 1294  
1293 1295 public BaseResponse reviewList(Integer page, Integer limit, String couresId) {
1294 1296 ReviewQuery reviewQuery = new ReviewQuery();
  1297 +
1295 1298 reviewQuery.setYn(YnEnums.YES.getId());
1296 1299 reviewQuery.setNeed("true");
1297 1300 reviewQuery.setPage(page);
1298 1301 reviewQuery.setLimit(limit);
1299 1302 reviewQuery.setCouresId(couresId);
  1303 + reviewQuery.setState(1);
  1304 + reviewQuery.setParentId("0");
  1305 +
1300 1306 BaseListResponse objectResponse = new BaseListResponse();
1301 1307 List<ReviewModel> models = courseEvalService.reviewList(reviewQuery);
1302 1308  
1303   - objectResponse.setData(models);
  1309 + ArrayList<ReviewModel> objects = new ArrayList<>();
  1310 +
  1311 + for (ReviewModel model : models) {
  1312 + String id = model.getId();
  1313 + String parentId = model.getParentId();
  1314 + if (id!=parentId){
  1315 + objects.add(model);
  1316 + }
  1317 + }
  1318 + objectResponse.setData(objects);
1304 1319 objectResponse.setPageInfo(reviewQuery.getPageInfo());
1305 1320 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1306 1321 objectResponse.setErrormsg("成功");
... ... @@ -1314,6 +1329,8 @@
1314 1329 String format = df.format(day);
1315 1330 reviewModel.setCreateDate(format);
1316 1331 reviewModel.setYn(YnEnums.YES.getId());
  1332 + reviewModel.setParentId("0");
  1333 + reviewModel.setState(0);
1317 1334  
1318 1335 courseEvalService.reviewAdd(reviewModel);
1319 1336 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1320 1337  
1321 1338  
1322 1339  
1323 1340  
1324 1341  
1325 1342  
1326 1343  
1327 1344  
1328 1345  
... ... @@ -1328,44 +1345,49 @@
1328 1345 String format = df.format(day);
1329 1346 reviewModel.setCreateDate(format);
1330 1347 reviewModel.setYn(YnEnums.YES.getId());
  1348 + reviewModel.setState(1);
1331 1349 //操作人为当前用户id
1332 1350 reviewModel.setParentId(reviewModel.getParentId());
  1351 + reviewModel.setCouresId(reviewModel.getCouresId());
  1352 + courseEvalService.reviewAdd(reviewModel);
1333 1353  
  1354 + ReviewModel reviewModelUpdate = new ReviewModel();
  1355 + reviewModelUpdate.setId(reviewModel.getParentId());
  1356 + reviewModelUpdate.setState(1);
  1357 + courseEvalService.reviewUpdate(reviewModelUpdate);
1334 1358  
1335   - courseEvalService.reviewAdd(reviewModel);
1336 1359 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1337 1360 objectResponse.setErrormsg("成功");
1338 1361 return objectResponse;
1339 1362 }
1340 1363  
1341   - public BaseResponse reviewUserList(String couresId, String id, Integer userId) {
  1364 + public BaseResponse reviewUserList(String couresId,String reviewId) {
1342 1365 ReviewQuery reviewQuery = new ReviewQuery();
1343 1366 reviewQuery.setYn(YnEnums.YES.getId());
1344 1367 reviewQuery.setNeed("true");
1345 1368 reviewQuery.setCouresId(couresId);
1346   - reviewQuery.setReviewId(userId.toString());
  1369 + reviewQuery.setReviewId(reviewId);
1347 1370 BaseListResponse objectResponse = new BaseListResponse();
  1371 +
1348 1372 List<ReviewModel> models = courseEvalService.reviewList(reviewQuery);
1349 1373  
1350 1374 ReviewQuery reviewQuery1 = new ReviewQuery();
1351 1375 List<ReviewModel> models1 = courseEvalService.reviewQuery1List(reviewQuery1);
1352 1376  
1353   -
1354   - List<ReviewModel> matchingModels = new ArrayList<>(); // 创建用于存放匹配数据的新集合
1355   -
  1377 + ArrayList<ReviewModel> reviewModels = new ArrayList<>();
1356 1378 for (ReviewModel model : models) {
1357   - String ids = model.getId(); // 获取models中的ID
1358   - for (ReviewModel model1 : models1) {
1359   - if (model1.getParentId() == ids) { // 在models1中查找匹配的parentId
1360   - matchingModels.add(model); // 将对应的models数据添加到匹配集合中
1361   - matchingModels.add(model1); // 将对应的models1数据添加到匹配集合中
1362   - break; // 找到匹配数据后跳出内层循环
  1379 + String id = model.getId();
  1380 + reviewModels.add(model);
  1381 + for (ReviewModel reviewModel : models1) {
  1382 + if (id.equals(reviewModel.getParentId())){
  1383 + reviewModels.add(reviewModel);
1363 1384 }
1364 1385 }
1365 1386 }
1366 1387  
1367 1388  
1368   - objectResponse.setData(matchingModels);
  1389 + // 将第一条数据也添加到列表中
  1390 + objectResponse.setData(reviewModels);
1369 1391 objectResponse.setPageInfo(reviewQuery.getPageInfo());
1370 1392 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1371 1393 objectResponse.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ a986dbb
... ... @@ -108,10 +108,10 @@
108 108 private OrganizationGroupsFacade groupsFacade;
109 109 @Autowired
110 110 private ITrackDownService trackDownService;
  111 +
111 112 @Autowired
112 113 @Qualifier("commonThreadPool")
113 114 private ThreadPoolTaskExecutor commonThreadPool;
114   -
115 115 @Autowired
116 116 private MongoTemplate mongoTemplate;
117 117 @Autowired
118 118  
119 119  
120 120  
... ... @@ -1528,20 +1528,16 @@
1528 1528 Criteria criteria1 = Criteria.where("name").is("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次");
1529 1529 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1));
1530 1530 } else if ("2".equals(riskPatientsQueryRequest.getTwinsType())) {
1531   - Criteria criteria2 = Criteria.where("name").is("瘢痕子宫（距前次剖宫产不足2年）");
  1531 + Criteria criteria2 = Criteria.where("name").is("剖宫产1次");
1532 1532 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria2));
1533 1533 } else if ("3".equals(riskPatientsQueryRequest.getTwinsType())) {
1534   - Criteria criteria3 = Criteria.where("name").is("剖宫产1次");
  1534 + Criteria criteria3 = Criteria.where("name").is("剖宫产≥2次");
1535 1535 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3));
1536   - } else if ("4".equals(riskPatientsQueryRequest.getTwinsType())) {
1537   - Criteria criteria4 = Criteria.where("name").is("剖宫产≥2次");
1538   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
1539 1536 } else {
1540 1537 Criteria criteria1 = Criteria.where("name").is("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次");
1541   - Criteria criteria2 = Criteria.where("name").is("瘢痕子宫（距前次剖宫产不足2年）");
1542   - Criteria criteria3 = Criteria.where("name").is("剖宫产1次");
1543   - Criteria criteria4 = Criteria.where("name").is("剖宫产≥2次");
1544   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4));
  1538 + Criteria criteria2 = Criteria.where("name").is("剖宫产1次");
  1539 + Criteria criteria3 = Criteria.where("name").is("剖宫产≥2次");
  1540 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3));
1545 1541 }
1546 1542 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
1547 1543 List <String> rFactorList = new ArrayList <>();
1548 1544  
1549 1545  
... ... @@ -1734,23 +1730,16 @@
1734 1730 }
1735 1731 return data;
1736 1732 }
1737   -
1738   - /**
1739   - * 甲减产妇全部孕妇管理
1740   - *
1741   - *
1742   - */
1743   - public BaseResponse queryhypothyroidismAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
  1733 + public BaseResponse queryHypothyroidismAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
1744 1734 String hospital = autoMatchFacade.getHospitalId(userId);
1745 1735 //威县数据流转
1746 1736 /*if(OrganizationConstant.XT_WX.equals(hospital)){
1747 1737 riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId));
1748 1738 }*/
1749   -
  1739 + //riskPatientsQueryRequest.sethId(hospital);
1750 1740 //组合请求
1751   - PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
1752   -
1753   -
  1741 + PatientsQuery patientsQuery = new PatientsQuery();//complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
  1742 + patientsQuery.setHospitalId(hospital);
1754 1743 //查询符合条件的孕妇
1755 1744 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
1756 1745 stopWatch.start();
1757 1746  
1758 1747  
... ... @@ -1766,22 +1755,15 @@
1766 1755 Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%");
1767 1756 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3));
1768 1757 } else if ("4".equals(riskPatientsQueryRequest.getTwinsType())) {
1769   - Criteria criteria4 = Criteria.where("name").is("甲状腺功能亢进症");
  1758 + Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低（无需药物治疗）");
1770 1759 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
1771   - }else if ("5".equals(riskPatientsQueryRequest.getTwinsType())) {
1772   - Criteria criteria5 = Criteria.where("name").is("甲状腺功能减退症");
1773   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria5));
1774   - }else if ("6".equals(riskPatientsQueryRequest.getTwinsType())) {
1775   - Criteria criteria6 = Criteria.where("name").is("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病");
1776   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria6));
1777   - }else {
  1760 + } else {
1778 1761 Criteria criteria1 = Criteria.where("name").is("亚临床甲减");
1779 1762 Criteria criteria2 = Criteria.where("name").is("甲减（需药物治疗）");
1780 1763 Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%");
1781   - Criteria criteria4 = Criteria.where("name").is("甲状腺功能亢进症");
1782   - Criteria criteria5 = Criteria.where("name").is("甲状腺功能减退症");
1783   - Criteria criteria6 = Criteria.where("name").is("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病");
1784   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6));
  1764 + Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低（无需药物治疗）");
  1765 +
  1766 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4));
1785 1767 }
1786 1768 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
1787 1769 List <String> rFactorList = new ArrayList <>();
... ... @@ -1790,7 +1772,8 @@
1790 1772 rFactorList.add(models.get(i).getId());
1791 1773 }
1792 1774 }
1793   - patientsQuery.setrFactorList(rFactorList);
  1775 + //TODO 换查询方式，把in改成包含
  1776 + patientsQuery.setjFactorList(rFactorList);
1794 1777 List <Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
1795 1778 stopWatch.stop();
1796 1779  
1797 1780  
... ... @@ -1800,13 +1783,13 @@
1800 1783 if (type == 1) {
1801 1784 //处理全部孕妇的情况
1802 1785 data = convertToHypothyroidismPatient(riskPatientsQueryRequest, patientses, userId, hospital);
  1786 +
1803 1787 }
1804 1788 }
1805 1789 // patientsQuery.mysqlBuild(data.size());
1806 1790 return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
1807 1791 }
1808 1792  
1809   -
1810 1793 private List convertToHypothyroidismPatient(RiskPatientsQueryRequest riskPatientsQueryRequest, List<Patients> patientses, Integer userId, String hospital) {
1811 1794 List data = new ArrayList <>();
1812 1795 int batchSize = 4;
... ... @@ -1828,6 +1811,7 @@
1828 1811 }
1829 1812 return data;
1830 1813 }
  1814 +
1831 1815 public BaseResponse queryScarUterusAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
1832 1816 String hospital = autoMatchFacade.getHospitalId(userId);
1833 1817 //威县数据流转
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java View file @ a986dbb
... ... @@ -41,6 +41,16 @@
41 41 private String hospitalId;
42 42 private String courseEndTime;
43 43  
  44 + private String courseVideo;
  45 +
  46 + public String getCourseVideo() {
  47 + return courseVideo;
  48 + }
  49 +
  50 + public void setCourseVideo(String courseVideo) {
  51 + this.courseVideo = courseVideo;
  52 + }
  53 +
44 54 public Integer getCourseObjId() {
45 55 return courseObjId;
46 56 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ a986dbb
... ... @@ -194,6 +194,8 @@
194 194 //体重异常管理-接收建档时间筛选用
195 195 private String buildDate;
196 196  
  197 +
  198 +
197 199 public String getVillageRegisterId() {
198 200 return villageRegisterId;
199 201 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java View file @ a986dbb
... ... @@ -60,6 +60,16 @@
60 60 private Integer courseDocAvg;
61 61 private String courseEndTime;
62 62  
  63 + private String courseVideo;
  64 +
  65 + public String getCourseVideo() {
  66 + return courseVideo;
  67 + }
  68 +
  69 + public void setCourseVideo(String courseVideo) {
  70 + this.courseVideo = courseVideo;
  71 + }
  72 +
63 73 public String getCourseEndTime() {
64 74 return courseEndTime;
65 75 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CesareanWorker.java View file @ a986dbb
... ... @@ -50,11 +50,11 @@
50 50 private RiskPatientsQueryRequest riskPatientsQueryRequest;
51 51  
52 52 public CesareanWorker(RiskPatientsQueryRequest riskPatientsQueryRequest,
53   - List<Patients> patientses,
54   - UsersService usersService,
55   - String hospital,
56   - AntenatalExaminationService antExService,
57   - BasicConfigService basicConfigService, PatientsService patientsService, OrganizationService organizationService) {
  53 + List<Patients> patientses,
  54 + UsersService usersService,
  55 + String hospital,
  56 + AntenatalExaminationService antExService,
  57 + BasicConfigService basicConfigService, PatientsService patientsService, OrganizationService organizationService) {
58 58 this.riskPatientsQueryRequest = riskPatientsQueryRequest;
59 59 this.patientses = patientses;
60 60 this.usersService = usersService;
... ... @@ -80,7 +80,7 @@
80 80  
81 81 for (Patients patients : patientses) {
82 82  
83   - StopWatch stopWatch = new StopWatch("CesareanWorker -" + patients.getId());
  83 + StopWatch stopWatch = new StopWatch("InfectiousWorker -" + patients.getId());
84 84 TwinsPatientsResult twinsPatientsResult = new TwinsPatientsResult();
85 85 twinsPatientsResult.setYi("-");
86 86 twinsPatientsResult.setEr("-");
... ... @@ -262,10 +262,10 @@
262 262 if (StringUtils.isNotEmpty(srt)) {
263 263 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
264 264 if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
265   - if(basicConfig.getName().contains("各类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥2次") ||
266   - basicConfig.getName().contains("瘢痕子宫(距前次剖宫产不足2年)") ||
267   - basicConfig.getName().contains("剖宫产1次")||
268   - basicConfig.getName().contains("剖宫产≥2次")){
  265 + if(basicConfig.getName().contains("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次") ||
  266 + basicConfig.getName().contains("剖宫产1次") ||
  267 + basicConfig.getName().contains("剖宫产≥2次")
  268 + ){
269 269 sb.append(basicConfig.getName()).append(',');
270 270 }
271 271 }
272 272  
273 273  
274 274  
... ... @@ -315,25 +315,20 @@
315 315 if (twinsPatientsResult.getrFactor() != null) {
316 316 //双绒双羊、单绒单羊、单绒双羊
317 317 if ("1".equals(twinsType)) {
318   - if (twinsPatientsResult.getrFactor().contains("类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥次")) {
  318 + if (twinsPatientsResult.getrFactor().contains("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次")) {
319 319 data.add(twinsPatientsResult);
320 320 }
321 321  
322 322 } else if ("2".equals(twinsType)) {
323   - if (twinsPatientsResult.getrFactor().contains("瘢痕子宫(距前次剖宫产不足2年)")) {
324   - data.add(twinsPatientsResult);
325   - }
326   - } else if ("3".equals(twinsType)) {
327 323 if (twinsPatientsResult.getrFactor().contains("剖宫产1次")) {
328 324 data.add(twinsPatientsResult);
329 325 }
330   - } else if ("4".equals(twinsType)) {
  326 + } else if ("3".equals(twinsType)) {
331 327 if (twinsPatientsResult.getrFactor().contains("剖宫产≥2次")) {
332 328 data.add(twinsPatientsResult);
333 329 }
334   - } else if (twinsPatientsResult.getrFactor().contains("类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥次") ||
335   - twinsPatientsResult.getrFactor().contains("瘢痕子宫(距前次剖宫产不足2年)") ||
336   - twinsPatientsResult.getrFactor().contains("剖宫产1次")||
  330 + }else if (twinsPatientsResult.getrFactor().contains("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次") ||
  331 + twinsPatientsResult.getrFactor().contains("剖宫产1次") ||
337 332 twinsPatientsResult.getrFactor().contains("剖宫产≥2次")) {
338 333 data.add(twinsPatientsResult);
339 334 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/HypothyroidismWorker.java View file @ a986dbb
... ... @@ -80,7 +80,7 @@
80 80  
81 81 for (Patients patients : patientses) {
82 82  
83   - StopWatch stopWatch = new StopWatch("HypothyroidismWorker -" + patients.getId());
  83 + StopWatch stopWatch = new StopWatch("InfectiousWorker -" + patients.getId());
84 84 TwinsPatientsResult twinsPatientsResult = new TwinsPatientsResult();
85 85 twinsPatientsResult.setYi("-");
86 86 twinsPatientsResult.setEr("-");
... ... @@ -263,11 +263,10 @@
263 263 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt);
264 264 if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) {
265 265 if(basicConfig.getName().contains("亚临床甲减") ||
266   - basicConfig.getName().contains("甲减(需药物治疗)")||
267   - basicConfig.getName().contains("状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%")||
268   - basicConfig.getName().contains("甲状腺功能亢进症")||
269   - basicConfig.getName().contains("甲状腺功能减退症")||
270   - basicConfig.getName().contains("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病")){
  266 + basicConfig.getName().contains("甲减（需药物治疗）") ||
  267 + basicConfig.getName().contains("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%")||
  268 + basicConfig.getName().contains("甲状腺功能减低（无需药物治疗）")
  269 + ){
271 270 sb.append(basicConfig.getName()).append(',');
272 271 }
273 272 }
274 273  
275 274  
276 275  
... ... @@ -326,27 +325,18 @@
326 325 data.add(twinsPatientsResult);
327 326 }
328 327 } else if ("3".equals(twinsType)) {
329   - if (twinsPatientsResult.getrFactor().contains("状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%")) {
  328 + if (twinsPatientsResult.getrFactor().contains("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50")) {
330 329 data.add(twinsPatientsResult);
331 330 }
332 331 } else if ("4".equals(twinsType)) {
333   - if (twinsPatientsResult.getrFactor().contains("甲状腺功能亢进症")) {
  332 + if (twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")) {
334 333 data.add(twinsPatientsResult);
335 334 }
336   - } else if ("5".equals(twinsType)) {
337   - if (twinsPatientsResult.getrFactor().contains("甲状腺功能减退症")) {
338   - data.add(twinsPatientsResult);
339   - }
340   - } else if ("6".equals(twinsType)) {
341   - if (twinsPatientsResult.getrFactor().contains("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病")) {
342   - data.add(twinsPatientsResult);
343   - }
344   - } else if (twinsPatientsResult.getrFactor().contains("亚临床甲减") ||
  335 + }else if (twinsPatientsResult.getrFactor().contains("亚临床甲减") ||
345 336 twinsPatientsResult.getrFactor().contains("甲减(需药物治疗)") ||
346   - twinsPatientsResult.getrFactor().contains("状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%") ||
347   - twinsPatientsResult.getrFactor().contains("甲状腺功能亢进症") ||
348   - twinsPatientsResult.getrFactor().contains("甲状腺功能减退症") ||
349   - twinsPatientsResult.getrFactor().contains("甲状腺功能亢进并发心脏病、感染、肝功能异常、精神异常等疾病")) {
  337 + twinsPatientsResult.getrFactor().contains("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%")||
  338 + twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")
  339 + ) {
350 340 data.add(twinsPatientsResult);
351 341 }
352 342 }