jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b8ddcc9f06bd623ad2e93365bbd01b4737ace47b

Authored by liquanyu
1 parent 107ffd309c
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

code update

Showing 4 changed files with 193 additions and 197 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java View file @ b8ddcc9
... ... @@ -96,17 +96,16 @@
96 96 }
97 97  
98 98 /**
99   - * 导出儿童转诊
  99 + * 导出孕妇转诊
100 100 * @param orderQueryRequest
101 101 * @param request
102 102 * @return
103 103 */
104   - @RequestMapping(method = RequestMethod.GET,value = "/exportChildZZ")
105   - @ResponseBody
  104 + @RequestMapping(method = RequestMethod.GET,value = "/exportYunZZ")
106 105 @TokenRequired
107   - public void exportChildZZ(@Valid ApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request,HttpServletResponse response){
  106 + public void exportYunZZ(@Valid ApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request,HttpServletResponse response){
108 107 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
109   - applyOrderFacade.exportChildZZ(orderQueryRequest, loginState.getId(),response);
  108 + applyOrderFacade.exportYunZZ(orderQueryRequest, loginState.getId(),response);
110 109 }
111 110  
112 111  
... ... @@ -122,6 +121,19 @@
122 121 public BaseResponse queryBabyApplyOrder(@Valid BabyApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request){
123 122 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
124 123 return applyOrderFacade.queryBabyApplyOrder(orderQueryRequest, loginState.getId());
  124 + }
  125 +
  126 + /**
  127 + * 导出儿童转诊
  128 + * @param orderQueryRequest
  129 + * @param request
  130 + * @return
  131 + */
  132 + @RequestMapping(method = RequestMethod.GET,value = "/exportChildZZ")
  133 + @TokenRequired
  134 + public void exportChildZZ(@Valid BabyApplyOrderQueryRequest orderQueryRequest,HttpServletRequest request,HttpServletResponse response){
  135 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  136 + applyOrderFacade.exportChildZZ(orderQueryRequest, loginState.getId(),response);
125 137 }
126 138  
127 139  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ b8ddcc9
... ... @@ -742,215 +742,175 @@
742 742 return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
743 743 }
744 744  
745   - public void exportChildZZ(ApplyOrderQueryRequest applyOrderQueryRequest, Integer userId
  745 + public void exportYunZZ(ApplyOrderQueryRequest applyOrderQueryRequest, Integer userId
746 746 ,HttpServletResponse response) {
747   - ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
748   - referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
749   - Date currentDate = DateUtil.formatDate(new Date());
750   - //根据年龄
751   - if (null != applyOrderQueryRequest.getEndAge()) {
752   - Date date = DateUtil.addYear(currentDate, -applyOrderQueryRequest.getEndAge());
753   - date = DateUtil.addYear(date,-1);
754   - referralApplyOrderQuery.setBirthStart(date);
755   - }
756 747  
757   - if (null != applyOrderQueryRequest.getStartAge()) {
758   - Date date = DateUtil.addYear(currentDate, -applyOrderQueryRequest.getStartAge());
759   - referralApplyOrderQuery.setBirthEnd(date);
760   - }
761   - //根据孕周
762   - if (null != applyOrderQueryRequest.getEndDueWeek()) {
763   - referralApplyOrderQuery.setDueDateEnd(applyOrderQueryRequest.getEndDueWeek());
764   - }
765   - if (null != applyOrderQueryRequest.getStartDueWeek()) {
766   -// int i = NumberUtils.toInt(applyOrderQueryRequest.getStartDueWeek()) * 7;
767   - referralApplyOrderQuery.setDueDateStart( applyOrderQueryRequest.getStartDueWeek());
768   - }
  748 + OutputStream out = null;
  749 + try {
  750 + List<Map<String,Object>> datas = new ArrayList<>();
  751 + List<ApplyOrderOutResult> orderModels = queryApplyOrder(applyOrderQueryRequest,userId).getData();
  752 + if (CollectionUtils.isNotEmpty(orderModels)) {
  753 + for (ApplyOrderOutResult orderModel : orderModels) {
769 754  
770   - if (null != applyOrderQueryRequest.getStartScore()) {
771   - referralApplyOrderQuery.setScoreStart(applyOrderQueryRequest.getStartScore());
772   - }
773   -
774   - if (null != applyOrderQueryRequest.getEndScore()) {
775   - referralApplyOrderQuery.setScoreEnd(applyOrderQueryRequest.getEndScore());
776   - }
777   -
778   - referralApplyOrderQuery.setRiskFactor(applyOrderQueryRequest.getRiskFactor());
779   - referralApplyOrderQuery.setrLevel(applyOrderQueryRequest.getrLevel());
780   - referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo());
781   - referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage());
782   - referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone());
783   -
784   - referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit());
785   - referralApplyOrderQuery.setType(applyOrderQueryRequest.getType());
786   - referralApplyOrderQuery.setNeed("1");
787   -
788   - String hospital = autoMatchFacade.getHospitalId(userId);
789   - referralApplyOrderQuery.setHospitalId(hospital);
790   - referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());
791   - //1 转入 0转出
792   - if ("1".equals(applyOrderQueryRequest.getAction())) {
793   - if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())) {
794   - if (NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())) {
795   - referralApplyOrderQuery.setOutHospitalId(applyOrderQueryRequest.getTransferredHospital());
796   - } else {
797   - OrganizationQuery organizationQuery = new OrganizationQuery();
798   - organizationQuery.setYn(YnEnums.YES.getId());
799   - organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital());
800   - List<Organization> organization = organizationService.queryOrganization(organizationQuery);
801   - if (CollectionUtils.isNotEmpty(organization)) {
802   - referralApplyOrderQuery.setOutHospitalId(organization.get(0).getId() + "");
803   - } else {
804   - referralApplyOrderQuery.setOutHospitalId(applyOrderQueryRequest.getTransferredHospital());
  755 + Map<String,Object> data = new HashMap<>();
  756 + data.put("name",orderModel.getName());
  757 + data.put("age",orderModel.getAge());
  758 + data.put("dueWeek",orderModel.getDueWeek());
  759 + data.put("cDueWeek", orderModel.getcDueWeek());
  760 + data.put("dueDate", orderModel.getDueDate());
  761 + data.put("rLevel", orderModel.getrLevel());
  762 + data.put("rRisk", orderModel.getrRisk());
  763 + data.put("score",orderModel.getScore());
  764 + data.put("transferredDisease",orderModel.getTransferredDisease());
  765 + data.put("created",orderModel.getCreated());
  766 + data.put("received",orderModel.getReceived());
  767 + data.put("phone",orderModel.getRealPhone());
  768 + data.put("status",orderModel.getStatus());
  769 + //1转入
  770 + if ("1".equals(applyOrderQueryRequest.getAction()))
  771 + {
  772 + data.put("zhuanCName",orderModel.getZhuanCName());
  773 + data.put("recDoctor",orderModel.getRecDoctor());
805 774 }
  775 + else if ("0".equals(applyOrderQueryRequest.getAction()))
  776 + {
  777 + data.put("zhuanRname",orderModel.getZhuanRname());
  778 + data.put("applyDoctor",orderModel.getApplyDoctor());
  779 + }
  780 + datas.add(data);
  781 +
806 782 }
807 783 }
  784 + out = response.getOutputStream();
  785 + Map<String,String> cnames = new HashMap<>();
808 786  
809   - referralApplyOrderQuery.setTransferredHospital(hospital);
810   - } else if ("0".equals(applyOrderQueryRequest.getAction())) {
811   - if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())) {
812   - if (NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())) {
813   - referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
814   - } else {
815   - OrganizationQuery organizationQuery = new OrganizationQuery();
816   - organizationQuery.setYn(YnEnums.YES.getId());
817   - organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital());
818   - List<Organization> organization = organizationService.queryOrganization(organizationQuery);
819   - if (CollectionUtils.isNotEmpty(organization)) {
820   - referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId() + "");
821   - } else {
822   - referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
823   - }
824   - }
  787 + //1转入
  788 + if ("1".equals(applyOrderQueryRequest.getAction()))
  789 + {
  790 + cnames.put("name", "姓名");
  791 + cnames.put("age","年龄");
  792 + cnames.put("dueWeek","转入孕周");
  793 + cnames.put("cDueWeek", "当前孕周");
  794 + cnames.put("dueDate", "预产期");
  795 + cnames.put("rLevel", "高危等级");
  796 + cnames.put("rRisk", "高危风险因素");
  797 + cnames.put("score","高危评分");
  798 + cnames.put("transferredDisease","转院必要性");
  799 + cnames.put("zhuanRname","转入医院");
  800 + cnames.put("created","转出日期");
  801 + cnames.put("received","接收日期");
  802 + cnames.put("applyDoctor","申请医生");
  803 + cnames.put("phone","联系方式");
  804 + cnames.put("status","状态");
825 805 }
826   - referralApplyOrderQuery.setOutHospitalId(hospital);
827   - }
828   - List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
  806 + //0转出
  807 + else if ("0".equals(applyOrderQueryRequest.getAction()))
  808 + {
829 809  
830   - List<Map<String,Object>> datas = new ArrayList<>();
  810 + cnames.put("name", "姓名");
  811 + cnames.put("age","年龄");
  812 + cnames.put("dueWeek","转入孕周");
  813 + cnames.put("cDueWeek", "当前孕周");
  814 + cnames.put("dueDate", "预产期");
  815 + cnames.put("rLevel", "高危等级");
  816 + cnames.put("rRisk", "高危风险因素");
  817 + cnames.put("score","高危评分");
  818 + cnames.put("transferredDisease","转院必要性");
  819 + cnames.put("zhuanCName","转出医院");
  820 + cnames.put("created","转出日期");
  821 + cnames.put("received","接收日期");
  822 + cnames.put("recDoctor","接收医生");
  823 + cnames.put("phone","联系方式");
  824 + cnames.put("status","状态");
  825 + }
831 826  
832   - if (CollectionUtils.isNotEmpty(orderModels)) {
833   - for (ReferralApplyOrderModel orderModel : orderModels) {
  827 + response.setContentType("application/octet-stream");
  828 + response.setHeader("Content-Disposition", "attachment;fileName="+"zhuanz.xls");
  829 + ExcelUtil.toExcel(out, datas, cnames);
  830 + } catch (IOException e) {
  831 + e.printStackTrace();
  832 + }
  833 + }
834 834  
835   - Map<String,Object> data = new HashMap<>();
  835 + public void exportChildZZ(BabyApplyOrderQueryRequest orderQueryRequest, Integer userId, HttpServletResponse response) {
  836 + OutputStream out = null;
  837 + try {
  838 + List<Map<String,Object>> datas = new ArrayList<>();
  839 + List<BabyApplyOrderResult> orderModels = queryBabyApplyOrder(orderQueryRequest, userId).getData();
  840 + if (CollectionUtils.isNotEmpty(orderModels)) {
  841 + for (BabyApplyOrderResult orderModel : orderModels) {
836 842  
837   - ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult();
838   - String zhuanchu = orderModel.getOutHospitalId();
839   - String zhuanru = orderModel.getTransferredHospital();
840   - String zhuanCName = zhuanchu;
841   - String zhuanRname = zhuanru;
842   - if (NumberUtils.isNumber(zhuanchu)) {
843   - Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu));
844   - if (null != zhuanc) {
845   - zhuanCName = zhuanc.getName();
  843 + Map<String,Object> data = new HashMap<>();
  844 + data.put("name",orderModel.getName());
  845 + data.put("hRisk",orderModel.gethRisk());
  846 + data.put("sex",orderModel.getSex());
  847 + data.put("yl", orderModel.getYl());
  848 + data.put("cyl", orderModel.getCyl());
  849 + data.put("birth", orderModel.getBirth());
  850 + data.put("mName", orderModel.getmName());
  851 + data.put("transferredDisease",orderModel.getTransferredDisease());
  852 + data.put("created",orderModel.getCreated());
  853 + data.put("received",orderModel.getReceived());
  854 + data.put("phone",orderModel.getRealPhone());
  855 + data.put("status",orderModel.getStatus());
  856 + //1转入
  857 + if ("1".equals(orderQueryRequest.getAction()))
  858 + {
  859 + data.put("zhuanCName", "转出医院");
  860 + data.put("recDoctor","接收医生");
846 861 }
847   - }
848   - if (NumberUtils.isNumber(zhuanru)) {
849   - Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru));
850   - if (null != zhuanc1) {
851   - zhuanRname = zhuanc1.getName();
  862 + else if ("0".equals(orderQueryRequest.getAction()))
  863 + {
  864 + data.put("zhuanCName",orderModel.getZhuanCName());
852 865 }
853   - }
  866 + datas.add(data);
854 867  
855   - if (NumberUtils.isNumber(orderModel.getApplyDoctor())) {
856   - Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getApplyDoctor()));
857   - if (null != users) {
858   - applyOrderResult.setApplyDoctor(users.getName());
859   - }
860 868 }
861   - if (NumberUtils.isNumber(orderModel.getRecDoctor())) {
862   - Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getRecDoctor()));
863   - if (null != users) {
864   - applyOrderResult.setRecDoctor(users.getName());
865   - }
866   - }
867   -
868   - StringBuilder stringBuilder = new StringBuilder();
869   - if(CollectionUtils.isNotEmpty(orderModel.getrRisk())){
870   - for(String str:orderModel.getrRisk()){
871   - stringBuilder.append(str).append(", ");
872   - }
873   - if(stringBuilder.length()>0){
874   - stringBuilder.setLength(stringBuilder.length() - 2);
875   - }
876   - }
877   -
878   - applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
879   - applyOrderResult.setrRisk(stringBuilder.toString());
880   - applyOrderResult.setScore(orderModel.getScore());
881   -
882   -
883   - List rLevel = new ArrayList();
884   - if(CollectionUtils.isNotEmpty(orderModel.getrLevel())){
885   - for(String str:orderModel.getrLevel()){
886   - Map map1 = new HashMap();
887   - map1.put("id", "");
888   - if (str.indexOf("预警") > -1) {
889   - str = str.replace("预警", "");
890   - }
891   - map1.put("name",str);
892   - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(str));
893   - rLevel.add(map1);
894   - }
895   - }
896   - applyOrderResult.setrLevel(rLevel);
897   - Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
898   - if (null != patients) {
899   - if (1 == patients.getDueStatus())
900   - applyOrderResult.setcDueWeek("终止妊娠");
901   - else if (patients.getType() == 3)
902   - applyOrderResult.setcDueWeek("已分娩");
903   - }
904 869 }
905   - }
906   -
907   - OutputStream out = null;
908   - try {
909 870 out = response.getOutputStream();
  871 + Map<String,String> cnames = new HashMap<>();
  872 +
  873 + //1转入
  874 + if ("1".equals(orderQueryRequest.getAction()))
  875 + {
  876 + cnames.put("name", "姓名");
  877 + cnames.put("hRisk","高危诊断");
  878 + cnames.put("sex","性别");
  879 + cnames.put("yl", "申请月龄");
  880 + cnames.put("cyl", "转入月龄");
  881 + cnames.put("birth", "出生日期");
  882 + cnames.put("mName", "母亲姓名");
  883 + cnames.put("zhuanCName", "转出医院");
  884 + cnames.put("transferredDisease","转院必要性");
  885 + cnames.put("created","转出日期");
  886 + cnames.put("received","接收日期");
  887 + cnames.put("phone","联系电话");
  888 + cnames.put("recDoctor","接收医生");
  889 + cnames.put("status","状态");
  890 + }
  891 + //0转出
  892 + else if ("0".equals(orderQueryRequest.getAction()))
  893 + {
  894 + cnames.put("name", "姓名");
  895 + cnames.put("hRisk","高危诊断");
  896 + cnames.put("sex","性别");
  897 + cnames.put("yl", "转出月龄");
  898 + cnames.put("cyl", "当前月龄");
  899 + cnames.put("birth", "出生日期");
  900 + cnames.put("mName", "母亲姓名");
  901 + cnames.put("transferredDisease","转院必要性");
  902 + cnames.put("zhuanRname","转入医院");
  903 + cnames.put("created","转出日期");
  904 + cnames.put("received","接收日期");
  905 + cnames.put("phone","联系电话");
  906 + cnames.put("status","状态");
  907 + }
  908 + response.setContentType("application/octet-stream");
  909 + response.setHeader("Content-Disposition", "attachment;fileName="+"zhuanz.xls");
  910 + ExcelUtil.toExcel(out, datas, cnames);
910 911 } catch (IOException e) {
911 912 e.printStackTrace();
912 913 }
913   - Map<String,String> cnames = new HashMap<>();
914   -
915   - if ("1".equals(applyOrderQueryRequest.getAction()))
916   - {
917   - cnames.put("name", "姓名");
918   - cnames.put("hRisk","高危诊断");
919   - cnames.put("sex","性别");
920   - cnames.put("yl", "转出月龄");
921   - cnames.put("cyl", "当前月龄");
922   - cnames.put("birth", "出生日期");
923   - cnames.put("mName", "母亲姓名");
924   - cnames.put("transferredDisease","转院必要性");
925   - cnames.put("zhuanRname","转入医院");
926   - cnames.put("created","转出日期");
927   - cnames.put("received","接收日期");
928   - cnames.put("created","转出日期");
929   - cnames.put("phone","联系电话");
930   - cnames.put("status","状态");
931   - }
932   - else if ("0".equals(applyOrderQueryRequest.getAction()))
933   - {
934   - cnames.put("name", "姓名");
935   - cnames.put("hRisk","高危诊断");
936   - cnames.put("sex","性别");
937   - cnames.put("yl", "申请月龄");
938   - cnames.put("cyl", "转入月龄");
939   - cnames.put("birth", "出生日期");
940   - cnames.put("mName", "母亲姓名");
941   - cnames.put("zhuanCName", "转出医院");
942   - cnames.put("transferredDisease","转院必要性");
943   - cnames.put("created","转出日期");
944   - cnames.put("received","接收日期");
945   - cnames.put("phone","联系电话");
946   - cnames.put("recDoctor","接收医生");
947   - cnames.put("status","状态");
948   - }
949   -
950   - response.setContentType("application/octet-stream");
951   - response.setHeader("Content-Disposition", "attachment;fileName="+"zhuanz.xls");
952   - ExcelUtil.toExcel(out, datas, cnames);
953   -
954 914 }
955 915 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java View file @ b8ddcc9
... ... @@ -52,6 +52,10 @@
52 52 private String cardNo;
53 53 //联系方式
54 54 private String phone;
  55 +
  56 + //联系方式
  57 + private String realPhone;
  58 +
55 59 //创建时间
56 60 private String created;
57 61 private String status;
... ... @@ -80,6 +84,14 @@
80 84 return cDueWeek;
81 85 }
82 86  
  87 + public String getRealPhone() {
  88 + return realPhone;
  89 + }
  90 +
  91 + public void setRealPhone(String realPhone) {
  92 + this.realPhone = realPhone;
  93 + }
  94 +
83 95 public String getPid() {
84 96 return pid;
85 97 }
... ... @@ -358,6 +370,7 @@
358 370 }
359 371 setCardNo(destModel.getCardNo());
360 372 setPhone(StringUtils.encryPhone(destModel.getPhone()));
  373 + setRealPhone(destModel.getPhone());
361 374 return this;
362 375 }
363 376 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java View file @ b8ddcc9
... ... @@ -49,6 +49,7 @@
49 49 //接收日期
50 50 private String received;
51 51 private String phone;
  52 + private String realPhone;
52 53 private String babyId;
53 54  
54 55 //转出医院
... ... @@ -57,6 +58,14 @@
57 58 private String zhuanRname;
58 59 private String status;
59 60  
  61 + public String getRealPhone() {
  62 + return realPhone;
  63 + }
  64 +
  65 + public void setRealPhone(String realPhone) {
  66 + this.realPhone = realPhone;
  67 + }
  68 +
60 69 public String getRecDoctor() {
61 70  
62 71 if(null==recDoctor){
... ... @@ -127,6 +136,8 @@
127 136 setmName(referralApplyOrderModel.getMname());
128 137 setSex(SexEnum.getTextById(referralApplyOrderModel.getSex()));
129 138 setPhone(StringUtils.encryPhone(referralApplyOrderModel.getPhone()));
  139 +
  140 + setRealPhone(referralApplyOrderModel.getPhone());
130 141 if (null != referralApplyOrderModel.getReceived()) {
131 142 setReceived(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getReceived()));
132 143 }