jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f4dbc96395c4706284179e3a5c6c9ba39e16246c

Authored by gaohan
1 parent bb775ffbd1
Exists in dev

修改视频未返回和专病相关代码

Showing 10 changed files with 66 additions and 42 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ f4dbc96
... ... @@ -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-dal/src/main/java/com/lyms/platform/pojo/MsgModel.java View file @ f4dbc96
... ... @@ -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/query/PatientsQuery.java View file @ f4dbc96
... ... @@ -265,6 +265,12 @@
265 265 private List<String> rFactorList;
266 266  
267 267  
  268 + /**
  269 + * 高危因素甲减集合
  270 + */
  271 + private List<String> jFactorList;
  272 +
  273 +
268 274 private boolean norFactor;
269 275  
270 276 //国家高危因数为空集合
... ... @@ -1223,6 +1229,8 @@
1223 1229 }
1224 1230 } else if (null != rFactorList && !rFactorList.isEmpty()) {
1225 1231 condition = condition.and("riskFactorId", rFactorList, MongoOper.IN);
  1232 + }else if (null != jFactorList && !jFactorList.isEmpty()) {
  1233 + condition = condition.and("riskFactorId", jFactorList, MongoOper.NIN);
1226 1234 }
1227 1235  
1228 1236 if (isNullrFactor) {
1229 1237  
... ... @@ -1633,7 +1641,13 @@
1633 1641 public void setrFactorList(List<String> rFactorList) {
1634 1642 this.rFactorList = rFactorList;
1635 1643 }
  1644 + public List<String> getjFactorList() {
  1645 + return jFactorList;
  1646 + }
1636 1647  
  1648 + public void setjFactorList(List<String> jFactorList) {
  1649 + this.jFactorList = jFactorList;
  1650 + }
1637 1651 public Date getCreatedTimeEnd() {
1638 1652 return createdTimeEnd;
1639 1653 }
... ... @@ -2463,7 +2477,6 @@
2463 2477 public Integer getFmAgeEnd() {
2464 2478 return fmAgeEnd;
2465 2479 }
2466   -
2467 2480 public void setFmAgeEnd(Integer fmAgeEnd) {
2468 2481 this.fmAgeEnd = fmAgeEnd;
2469 2482 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ f4dbc96
... ... @@ -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/PatientFacade.java View file @ f4dbc96
... ... @@ -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  
... ... @@ -1730,23 +1730,16 @@
1730 1730 }
1731 1731 return data;
1732 1732 }
1733   -
1734   - /**
1735   - * 甲减产妇全部孕妇管理
1736   - *
1737   - *
1738   - */
1739   - 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) {
1740 1734 String hospital = autoMatchFacade.getHospitalId(userId);
1741 1735 //威县数据流转
1742 1736 /*if(OrganizationConstant.XT_WX.equals(hospital)){
1743 1737 riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId));
1744 1738 }*/
1745   -
  1739 + //riskPatientsQueryRequest.sethId(hospital);
1746 1740 //组合请求
1747   - PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
1748   -
1749   -
  1741 + PatientsQuery patientsQuery = new PatientsQuery();//complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
  1742 + patientsQuery.setHospitalId(hospital);
1750 1743 //查询符合条件的孕妇
1751 1744 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
1752 1745 stopWatch.start();
1753 1746  
1754 1747  
... ... @@ -1762,13 +1755,14 @@
1762 1755 Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%");
1763 1756 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria3));
1764 1757 } else if ("4".equals(riskPatientsQueryRequest.getTwinsType())) {
1765   - Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低(无需药物治疗");
  1758 + Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低（无需药物治疗）");
1766 1759 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria4));
1767   - }else {
  1760 + } else {
1768 1761 Criteria criteria1 = Criteria.where("name").is("亚临床甲减");
1769 1762 Criteria criteria2 = Criteria.where("name").is("甲减（需药物治疗）");
1770 1763 Criteria criteria3 = Criteria.where("name").is("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%");
1771   - Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低(无需药物治疗");
  1764 + Criteria criteria4 = Criteria.where("name").is("甲状腺功能减低（无需药物治疗）");
  1765 +
1772 1766 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4));
1773 1767 }
1774 1768 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
... ... @@ -1778,7 +1772,8 @@
1778 1772 rFactorList.add(models.get(i).getId());
1779 1773 }
1780 1774 }
1781   - patientsQuery.setrFactorList(rFactorList);
  1775 + //TODO 换查询方式，把in改成包含
  1776 + patientsQuery.setjFactorList(rFactorList);
1782 1777 List <Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
1783 1778 stopWatch.stop();
1784 1779  
1785 1780  
... ... @@ -1788,13 +1783,13 @@
1788 1783 if (type == 1) {
1789 1784 //处理全部孕妇的情况
1790 1785 data = convertToHypothyroidismPatient(riskPatientsQueryRequest, patientses, userId, hospital);
  1786 +
1791 1787 }
1792 1788 }
1793 1789 // patientsQuery.mysqlBuild(data.size());
1794 1790 return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
1795 1791 }
1796 1792  
1797   -
1798 1793 private List convertToHypothyroidismPatient(RiskPatientsQueryRequest riskPatientsQueryRequest, List<Patients> patientses, Integer userId, String hospital) {
1799 1794 List data = new ArrayList <>();
1800 1795 int batchSize = 4;
... ... @@ -1816,6 +1811,7 @@
1816 1811 }
1817 1812 return data;
1818 1813 }
  1814 +
1819 1815 public BaseResponse queryScarUterusAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
1820 1816 String hospital = autoMatchFacade.getHospitalId(userId);
1821 1817 //威县数据流转
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ f4dbc96
... ... @@ -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 @ f4dbc96
... ... @@ -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 @ f4dbc96
... ... @@ -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("-");
87 87  
... ... @@ -262,9 +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次") ||
  265 + if(basicConfig.getName().contains("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次") ||
266 266 basicConfig.getName().contains("剖宫产1次") ||
267   - basicConfig.getName().contains("剖宫产≥2次")){
  267 + basicConfig.getName().contains("剖宫产≥2次")
  268 + ){
268 269 sb.append(basicConfig.getName()).append(',');
269 270 }
270 271 }
271 272  
... ... @@ -314,11 +315,11 @@
314 315 if (twinsPatientsResult.getrFactor() != null) {
315 316 //双绒双羊、单绒单羊、单绒双羊
316 317 if ("1".equals(twinsType)) {
317   - if (twinsPatientsResult.getrFactor().contains("类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥次")) {
  318 + if (twinsPatientsResult.getrFactor().contains("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次")) {
318 319 data.add(twinsPatientsResult);
319 320 }
320 321  
321   - }else if ("2".equals(twinsType)) {
  322 + } else if ("2".equals(twinsType)) {
322 323 if (twinsPatientsResult.getrFactor().contains("剖宫产1次")) {
323 324 data.add(twinsPatientsResult);
324 325 }
... ... @@ -326,8 +327,8 @@
326 327 if (twinsPatientsResult.getrFactor().contains("剖宫产≥2次")) {
327 328 data.add(twinsPatientsResult);
328 329 }
329   - } else if (twinsPatientsResult.getrFactor().contains("类子宫手术史(如剖宫产、宫角妊娠、子宫肌瘤挖除术等)≥次") ||
330   - twinsPatientsResult.getrFactor().contains("剖宫产1次")||
  330 + }else if (twinsPatientsResult.getrFactor().contains("各类子宫手术史（如剖宫产、宫角妊娠、子宫肌瘤挖除术等）≥2次") ||
  331 + twinsPatientsResult.getrFactor().contains("剖宫产1次") ||
331 332 twinsPatientsResult.getrFactor().contains("剖宫产≥2次")) {
332 333 data.add(twinsPatientsResult);
333 334 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/HypothyroidismWorker.java View file @ f4dbc96
... ... @@ -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,9 +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("甲状腺功能减低(无需药物治疗)")){
  266 + basicConfig.getName().contains("甲减（需药物治疗）") ||
  267 + basicConfig.getName().contains("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%")||
  268 + basicConfig.getName().contains("甲状腺功能减低（无需药物治疗）")
  269 + ){
269 270 sb.append(basicConfig.getName()).append(',');
270 271 }
271 272 }
272 273  
273 274  
... ... @@ -324,17 +325,18 @@
324 325 data.add(twinsPatientsResult);
325 326 }
326 327 } else if ("3".equals(twinsType)) {
327   - if (twinsPatientsResult.getrFactor().contains("状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%")) {
  328 + if (twinsPatientsResult.getrFactor().contains("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50")) {
328 329 data.add(twinsPatientsResult);
329 330 }
330 331 } else if ("4".equals(twinsType)) {
331 332 if (twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")) {
332 333 data.add(twinsPatientsResult);
333 334 }
334   - } else if (twinsPatientsResult.getrFactor().contains("亚临床甲减") ||
  335 + }else if (twinsPatientsResult.getrFactor().contains("亚临床甲减") ||
335 336 twinsPatientsResult.getrFactor().contains("甲减(需药物治疗)") ||
336   - twinsPatientsResult.getrFactor().contains("状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%") ||
337   - twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")) {
  337 + twinsPatientsResult.getrFactor().contains("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%")||
  338 + twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")
  339 + ) {
338 340 data.add(twinsPatientsResult);
339 341 }
340 342 }
platform-operate-api/src/main/resources/config.properties View file @ f4dbc96
... ... @@ -58,5 +58,5 @@
58 58  
59 59 #redis.servers=119.90.57.26:6379:Lyms123456
60 60 # 测试环境 118.193.124.187:6379:Lyms123456
61   -redis_servers=118.193.124.187:6379:Lyms123456
  61 +redis_servers=127.0.0.1:6379:123456