jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f65e9359167bcd46b7694f8ab90ded428de888f9

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

Merge branch 'master' of E:\platform\regional-platform with conflicts.

Showing 2 changed files with 199 additions and 99 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java View file @ f65e935
... ... @@ -2,7 +2,7 @@
2 2  
3 3 import com.lyms.platform.biz.service.PatientsService;
4 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
5   -import com.lyms.platform.common.result.BaseListResponse;
  5 +import com.lyms.platform.common.dao.BaseMongoDAO;
6 6 import com.lyms.platform.common.result.BaseObjectResponse;
7 7 import com.lyms.platform.operate.web.facade.ViewFacade;
8 8 import com.lyms.platform.pojo.AntExChuModel;
... ... @@ -10,6 +10,8 @@
10 10 import com.lyms.platform.pojo.Patients;
11 11 import org.apache.commons.lang.StringUtils;
12 12 import org.springframework.beans.factory.annotation.Autowired;
  13 +import org.springframework.data.mongodb.core.query.Query;
  14 +import org.springframework.data.mongodb.core.query.Criteria;
13 15 import org.springframework.stereotype.Service;
14 16  
15 17 import java.sql.Connection;
... ... @@ -29,6 +31,8 @@
29 31 private PatientsService patientsService;
30 32 @Autowired
31 33 private ViewFacade viewFacade;
  34 + @Autowired
  35 + private BaseMongoDAO baseMongoDAO;
32 36  
33 37 //初诊
34 38 public BaseObjectResponse saveAntexChu(AntExChuModel antExChuModel) {
... ... @@ -141,9 +145,11 @@
141 145 "jhBilirubin,ygbmky,ygbmkt,ygeky,ygekt,\n" +
142 146 "yghxkt,xqjq,xnsd,hivkt,ydfmw,ydqjd,\n" +
143 147 "bChao,heartRate,fetalPosition,fetalPresentation,join1,checkDate,\n" +
144   - "cDueWeek,checkDoctor,hospital,dirOpinion) " +
145   - "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," +
146   - "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
  148 + "cDueWeek,checkDoctor,hospital,dirOpinion,infectDiseases,screenResult,highRisk,highriskDesc," +
  149 + "nextCheckTime,yinchan,gongwaiyun,syjg,diagnosis,diagnosisOther) " +
  150 + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," +
  151 + "?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?," +
  152 + "?,?,?,?,?,?)";
147 153  
148 154  
149 155  
... ... @@ -164,8 +170,8 @@
164 170 }else{
165 171 ps.setString(7,null);
166 172 }
167   - if(map.get("treatmentOpinion3") != null){
168   - ps.setString(8,map.get("treatmentOpinion3").toString());
  173 + if(map.get("treatOpinion") != null){
  174 + ps.setString(8,map.get("treatOpinion").toString());
169 175 }else{
170 176 ps.setString(8,null);
171 177 }
... ... @@ -189,8 +195,8 @@
189 195 }else{
190 196 ps.setString(12,null);
191 197 }
192   - if(map.get("hivktSelect") != null){
193   - ps.setString(13,map.get("hivktSelect").toString());
  198 + if(map.get("hivkt") != null){
  199 + ps.setString(13,map.get("hivkt").toString());
194 200 }else{
195 201 ps.setString(13,null);
196 202 }
197 203  
198 204  
... ... @@ -557,10 +563,73 @@
557 563 ps.setString(89,map.get("dirOpinion").toString());
558 564 }else{
559 565 ps.setString(89,null);
  566 + }if(map.get("infectDiseases") != null){
  567 + ps.setString(90,map.get("infectDiseases").toString());
  568 + }else{
  569 + ps.setString(90,null);
560 570 }
  571 + if(map.get("screenResult") != null){
  572 + String r = "";
  573 + List<Map<String, Object>> listMap = (List)map.get("screenResult");
  574 + for(Map<String, Object> m : listMap){
  575 + r+=m.get("name");
  576 + }
  577 + ps.setString(91,r);
  578 + }else{
  579 + ps.setString(91,null);
  580 + }
  581 + if(map.get("highRisk") != null){
  582 + String s = "";
  583 + List<Map<String, Object>> listMap = (List)map.get("highRisk");
  584 + for(Map<String, Object> m : listMap){
  585 + s+=(m.get("name")+" ");
  586 + }
  587 + ps.setString(92,s);
  588 + }else{
  589 + ps.setString(92,null);
  590 + }
  591 + if(map.get("highriskDesc") != null){
  592 + ps.setString(93,map.get("highriskDesc").toString());
  593 + }else{
  594 + ps.setString(93,null);
  595 + }
  596 + if(map.get("sieveStatus") != null){
  597 + ps.setString(94,map.get("sieveStatus").toString());
  598 + }else{
  599 + ps.setString(94,null);
  600 + }
  601 + if(map.get("nextCheckTime") != null){
  602 + ps.setString(95,map.get("nextCheckTime").toString());
  603 + }else{
  604 + ps.setString(95,null);
  605 + }
  606 + if(map.get("yinchan") != null){
  607 + ps.setString(96,map.get("yinchan").toString());
  608 + }else{
  609 + ps.setString(96,null);
  610 + }
  611 + if(map.get("gongwaiyun") != null){
  612 + ps.setString(97,map.get("gongwaiyun").toString());
  613 + }else{
  614 + ps.setString(97,null);
  615 + }
  616 + if(map.get("syjg") != null){
  617 + ps.setString(98,map.get("syjg").toString());
  618 + }else{
  619 + ps.setString(98,null);
  620 + }
  621 + if(map.get("diagnosis") != null){
  622 + ps.setString(99,map.get("diagnosis").toString());
  623 + }else{
  624 + ps.setString(99,null);
  625 + }
  626 + if(map.get("diagnosisOther") != null){
  627 + ps.setString(100,map.get("diagnosisOther").toString());
  628 + }else{
  629 + ps.setString(100,null);
  630 + }
561 631  
562 632  
563   -
564 633 int result = ps.executeUpdate();
565 634 if(result > 0){
566 635 br.setErrorcode(ErrorCodeConstants.SUCCESS);
... ... @@ -568,10 +637,6 @@
568 637 return br;
569 638 }
570 639  
571   -
572   -
573   -
574   -
575 640 }
576 641  
577 642 }
... ... @@ -670,8 +735,9 @@
670 735 "quickenRemark,heartRate,FetalPosition,fetalPresentation,join1,\n" +
671 736 "hemoglobin,urineProtein,bloodSugar,bloodSugar2,\n" +
672 737 "bloodSugar3,bloodSugar4,bChao,diagnosis,\n" +
673   - "diagnosisOther,treatmentOpinion,guide) " +
674   - "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
  738 + "diagnosisOther,treatmentOpinion,guide,screenResult,highRisk,highriskDesc,\n" +
  739 + "resultSupple,sieveStatus,nextCheckTime,randomBloodSugar) " +
  740 + "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
675 741  
676 742 ps = conn.prepareStatement(innSql);
677 743 ps.setString(1,antenatalExaminationModel.getId());
678 744  
... ... @@ -803,7 +869,54 @@
803 869 }else{
804 870 ps.setString(33,null);
805 871 }
  872 + if(map.get("screenResult") != null){
  873 + String r = "";
  874 + List<Map<String, Object>> listMap = (List)map.get("screenResult");
  875 + for(Map<String, Object> m : listMap){
  876 + r+=m.get("name");
  877 + }
  878 + ps.setString(34,r);
  879 + }else{
  880 + ps.setString(34,null);
  881 + }
  882 + if(map.get("highRisk") != null){
  883 + String s = "";
  884 + List<Map<String, Object>> listMap = (List)map.get("highRisk");
  885 + for(Map<String, Object> m : listMap){
  886 + s+=(m.get("name")+" ");
  887 + }
  888 + ps.setString(35,s);
  889 + }else{
  890 + ps.setString(35,null);
  891 + }
  892 + if(map.get("highriskDesc") != null){
  893 + ps.setString(36,map.get("highriskDesc").toString());
  894 + }else{
  895 + ps.setString(36,null);
  896 + }
  897 + if(map.get("resultSupple") != null){
  898 + ps.setString(37,map.get("resultSupple").toString());
  899 + }else{
  900 + ps.setString(37,null);
  901 + }
  902 + if(map.get("sieveStatus") != null){
  903 + ps.setString(38,map.get("sieveStatus").toString());
  904 + }else{
  905 + ps.setString(38,null);
  906 + }
  907 + if(map.get("nextCheckTime") != null){
  908 + ps.setString(39,map.get("nextCheckTime").toString());
  909 + }else{
  910 + ps.setString(39,null);
  911 + }
  912 + if(map.get("randomBloodSugar") != null){
  913 + ps.setString(40,map.get("randomBloodSugar").toString());
  914 + }else{
  915 + ps.setString(40,null);
  916 + }
806 917  
  918 +
  919 +
807 920 int result = ps.executeUpdate();
808 921 if(result > 0){
809 922 br.setErrorcode(ErrorCodeConstants.SUCCESS);
... ... @@ -831,6 +944,25 @@
831 944 return null;
832 945 }
833 946  
  947 +
  948 + /**
  949 + * 诸城初诊暂时调用方法
  950 + * @param startDate
  951 + * @param endDate
  952 + * @return
  953 + */
  954 + public BaseObjectResponse saveChuZhen(String startDate,String endDate){
  955 + Criteria criteria = Criteria.where("created").gte(startDate).lte(endDate);
  956 + Query query = new Query(criteria);
  957 + List<AntExChuModel> list = baseMongoDAO.find(query);
  958 + if(list != null && list.size()>0){
  959 + for(AntExChuModel antExChuModel : list){
  960 + System.out.print(antExChuModel.getId());
  961 + }
  962 + }
  963 +
  964 + return null;
  965 + }
834 966  
835 967  
836 968 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ f65e935
... ... @@ -21,16 +21,16 @@
21 21 import com.lyms.platform.operate.web.service.ITrackDownService;
22 22 import com.lyms.platform.operate.web.worker.SieveWorker;
23 23 import com.lyms.platform.permission.model.Organization;
24   -import com.lyms.platform.permission.model.Users;
25 24 import com.lyms.platform.permission.service.OrganizationService;
26   -import com.lyms.platform.permission.service.UsersService;
27 25 import com.lyms.platform.pojo.*;
28 26 import com.lyms.platform.query.*;
  27 +/*import javafx.beans.binding.ObjectExpression;*/
29 28 import org.apache.commons.collections.CollectionUtils;
30 29 import org.apache.commons.lang.StringUtils;
31 30 import org.apache.commons.lang.math.NumberUtils;
32 31 import org.springframework.beans.factory.annotation.Autowired;
33 32 import org.springframework.beans.factory.annotation.Qualifier;
  33 +import org.springframework.data.domain.Sort;
34 34 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
35 35 import org.springframework.stereotype.Component;
36 36  
... ... @@ -61,9 +61,6 @@
61 61 private PatientsService patientsService;
62 62  
63 63 @Autowired
64   - private UsersService usersService;
65   -
66   - @Autowired
67 64 private OrganizationGroupsFacade groupsFacade;
68 65  
69 66 @Autowired
70 67  
... ... @@ -397,9 +394,12 @@
397 394 sieveQuery.setNeed(needPage);
398 395 String hospitalId = autoMatchFacade.getHospitalId(userId);
399 396 sieveQuery.setHospitalId(hospitalId);
  397 + // System.out.println("产筛列表："+sieveQuery.convertToQuery().convertToMongoQuery());
400 398 //查询产筛list
401 399 List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
402 400 List<SieveListResult> data = new ArrayList<>();
  401 +
  402 +
403 403 int batchSize = 4;
404 404 int end = 0;
405 405 List<Future> listFuture = new ArrayList<>();
... ... @@ -408,7 +408,7 @@
408 408 if (end > list.size()) {
409 409 end = list.size();
410 410 }
411   - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService,organizationService)));
  411 + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService)));
412 412 }
413 413 for (Future f : listFuture) {
414 414 try {
... ... @@ -417,6 +417,49 @@
417 417 ExceptionUtils.catchException(e, "cqSieve list get result Future error.");
418 418 }
419 419 }
  420 +
  421 +
  422 +
  423 +/*
  424 + if (CollectionUtils.isNotEmpty(list)) {
  425 + for (SieveModel sieveModel : list) {
  426 + SieveListResult sieveListResult = new SieveListResult();
  427 + AntExQuery antExQuery = new AntExQuery();
  428 + antExQuery.setYn(YnEnums.YES.getId());
  429 + antExQuery.setHospitalId(hospitalId);
  430 + antExQuery.setParentId(sieveModel.getParentId());
  431 + List<AntenatalExaminationModel> list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
  432 + if (CollectionUtils.isNotEmpty(list1)) {
  433 + if (StringUtils.isNotEmpty(list1.get(0).getTireNumber())) {
  434 + sieveModel.setTireNumber(NumberUtils.toInt(list1.get(0).getTireNumber()));
  435 + }
  436 + } else {
  437 + AntExChuQuery antExChuQuery = new AntExChuQuery();
  438 + antExChuQuery.setYn(YnEnums.YES.getId());
  439 + antExChuQuery.setParentId(sieveModel.getParentId());
  440 + antExChuQuery.setHospitalId(hospitalId);
  441 + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
  442 + if (CollectionUtils.isNotEmpty(antExChuModels)) {
  443 + if (StringUtils.isNotEmpty(antExChuModels.get(0).getTireNumber())) {
  444 + sieveModel.setTireNumber(NumberUtils.toInt(antExChuModels.get(0).getTireNumber()));
  445 + }
  446 + }
  447 + }
  448 +
  449 + sieveListResult.convertToResult(sieveModel);
  450 + Patients patients = patientsService.findOnePatientById(sieveModel.getParentId());
  451 + if (null != patients) {
  452 + sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1");
  453 + if (null != patients.getDueStatus() && 1 == patients.getDueStatus())
  454 + sieveListResult.setcDueWeek("终止妊娠");
  455 + else if (patients.getType() == 3) {
  456 + sieveListResult.setcDueWeek("已分娩");
  457 + }
  458 + sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
  459 + }
  460 + data.add(sieveListResult);
  461 + }
  462 + }*/
420 463 return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo());
421 464 }
422 465  
... ... @@ -598,7 +641,7 @@
598 641 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
599 642 }
600 643  
601   - public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) {
  644 + public BaseResponse getSieveApplyInfo(String parentId, Integer userId) {
602 645  
603 646 Map<String,Object> map = new HashMap<>();
604 647 String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -641,7 +684,7 @@
641 684 patientBaseResult.setRiskFactor(highScoreResult.getHighRisk());
642 685 patientBaseResult.setRiskScore(highScoreResult.getScoreStr());
643 686  
644   - map.put("patientInfo", patientBaseResult);
  687 + map.put("patientInfo",patientBaseResult);
645 688  
646 689 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
647 690 sieveApplyOrderQuery1.setParentId(parentId);
648 691  
... ... @@ -654,14 +697,12 @@
654 697 if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
655 698 {
656 699 Map<String,Object> result = new HashMap<>();
657   -
658   - Map<String,Object> viewInfo = new HashMap<>();
659 700 SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
660 701  
661 702 result.put("id",sieveApply.getId());
662 703 result.put("parentId",sieveApply.getParentId());
663 704  
664   - result.put("check",sieveApply.getCheckItem());
  705 + result.put("checkItem",sieveApply.getCheckItem());
665 706 result.put("guide",sieveApply.getGuide());
666 707 result.put("checkDate",sieveApply.getCheckDate());
667 708 result.put("applyDoctor",sieveApply.getApplyDoctor());
668 709  
669 710  
670 711  
... ... @@ -674,90 +715,17 @@
674 715 result.put("collectionDoctorId",sieveApply.getCollectionDoctorId());
675 716 result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
676 717 result.put("crl",sieveApply.getCrl());
677   - result.put("bpd",sieveApply.getBpd());
678 718 result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
679 719 result.put("historyBirth",sieveApply.getHistoryBirth());
680 720 result.put("pastHistory",sieveApply.getPastHistory());
681 721 result.put("applyHospitalId",sieveApply.getApplyHospitalId());
682 722 result.put("sendDoctor",sieveApply.getSendDoctor());
683 723 result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
684   - result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
685   - result.put("mensesDay",sieveApply.getMensesDay());
686   - result.put("mensesWeek",sieveApply.getMensesWeek());
687   - result.put("experimentNum","");
688 724  
689 725 map.put("sieveApplyInfo",result);
690 726  
691   - if (type == 1)
692   - {
693   - if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getApplyDoctor())) {
694   - Users users = usersService.getUsers(Integer.parseInt(sieveApply.getApplyDoctor()));
695   - if (users != null && users.getYn() == YnEnums.YES.getId()) {
696   - viewInfo.put("applyDoctorName",users.getName());
697   - }
698   - }
699   -
700   - if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getCollectionDoctorId())) {
701   - Users users = usersService.getUsers(Integer.parseInt(sieveApply.getCollectionDoctorId()));
702   - if (users != null && users.getYn() == YnEnums.YES.getId()) {
703   - viewInfo.put("collectionDoctorName",users.getName());
704   - }
705   - }
706   -
707   - if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getSendDoctor())) {
708   - Users users = usersService.getUsers(Integer.parseInt(sieveApply.getSendDoctor()));
709   - if (users != null && users.getYn() == YnEnums.YES.getId()) {
710   - viewInfo.put("sendDoctorName",users.getName());
711   - }
712   - }
713   - if (null != sieveApply.getApplyHospitalId()) {
714   - Organization org = organizationService.getOrganization(Integer.valueOf(sieveApply.getApplyHospitalId()));
715   - if (null != org) {
716   - viewInfo.put("applyHospitalName", org.getName());
717   - }
718   - }
719   - String isTire = "";
720   - String tireNumber = "";
721   -
722   - AntExChuQuery antExChuQuery1 = new AntExChuQuery();
723   - antExChuQuery1.setParentId(parentId);
724   - antExChuQuery1.setYn(YnEnums.YES.getId());
725   - List<AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
726   - if (CollectionUtils.isNotEmpty(data1))
727   - {
728   - AntExChuModel chuModel = data1.get(0);
729   - if (StringUtils.isNotEmpty(chuModel.getTireNumber()))
730   - {
731   - isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否";
732   - tireNumber = chuModel.getTireNumber();
733   - }
734   - }
735   -
736   - map.put("isTire",isTire);
737   - map.put("tireNumber",tireNumber);
738   -
739   - map.put("viewInfo",viewInfo);
740   - }
741   - else if (type == 3)
742   - {
743   - Map<String,Object> sieveInfo = new HashMap<>();
744   -
745   -
746   - map.put("sieveInfo",sieveInfo);
747   - }
748   -
749 727 }
750 728 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);
751   - }
752   -
753   - public BaseResponse reviceSieve(String parentId, Integer userId) {
754   - String hospitalId = autoMatchFacade.getHospitalId(userId);
755   - SieveModel sieve = new SieveModel();
756   - sieve.setParentId(parentId);
757   - sieve.setHospitalId(hospitalId);
758   - sieve.setReviceStatus(2);
759   - sieveService.updateOneChanQianDiaSieve(sieve);
760   - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
761 729 }
762 730 }