jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6ae8ee8a8a81645fc8c1019f2d8c04a9900f388d

Authored by jiangjiazhi
2 parents c2a0646fc1 edaae271c8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 14 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java View file @ 6ae8ee8
... ... @@ -13,6 +13,7 @@
13 13 import com.lyms.platform.common.utils.StringUtils;
14 14 import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
15 15 import com.lyms.platform.operate.web.facade.MatDeliverFacade;
  16 +import com.lyms.platform.operate.web.facade.PatientServiceFacade;
16 17 import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
17 18 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
18 19 import com.lyms.platform.permission.model.Users;
19 20  
... ... @@ -56,8 +57,9 @@
56 57 @Autowired
57 58 private BabyBookbuildingFacade babyBookbuildingFacade;
58 59  
  60 + @Autowired
  61 + private PatientServiceFacade patientServiceFacade;
59 62  
60   -
61 63 @Autowired
62 64 private DzfyHisService dzfyHisService;
63 65  
... ... @@ -632,6 +634,9 @@
632 634 request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
633 635 }
634 636 }
  637 +
  638 + //标准服务开通
  639 + request.setSerInfos(patientServiceFacade.defaultServiceOpen());
635 640 babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
636 641  
637 642 }catch (Exception e)
platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyFmService.java View file @ 6ae8ee8
... ... @@ -10,6 +10,7 @@
10 10 import com.lyms.platform.common.utils.StringUtils;
11 11 import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
12 12 import com.lyms.platform.operate.web.facade.MatDeliverFacade;
  13 +import com.lyms.platform.operate.web.facade.PatientServiceFacade;
13 14 import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
14 15 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
15 16 import com.lyms.platform.permission.model.Users;
16 17  
... ... @@ -50,8 +51,9 @@
50 51 private BabyBookbuildingFacade babyBookbuildingFacade;
51 52  
52 53 @Autowired
53   - private DzfyHisService dzfyHisService;
  54 + private PatientServiceFacade patientServiceFacade;
54 55  
  56 +
55 57 private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
56 58  
57 59 private static Map<String, List> babyMap = new HashMap<>();
... ... @@ -654,6 +656,11 @@
654 656 request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
655 657 }
656 658 }*/
  659 +
  660 +
  661 + //标准服务开通
  662 + request.setSerInfos(patientServiceFacade.defaultServiceOpen());
  663 +
657 664 babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
658 665  
659 666 }catch (Exception e)
platform-operate-api/src/main/java/com/lyms/hospitalapi/lpfy/LpfyFmService.java View file @ 6ae8ee8
... ... @@ -9,6 +9,7 @@
9 9 import com.lyms.platform.common.utils.StringUtils;
10 10 import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
11 11 import com.lyms.platform.operate.web.facade.MatDeliverFacade;
  12 +import com.lyms.platform.operate.web.facade.PatientServiceFacade;
12 13 import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
13 14 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
14 15 import com.lyms.platform.permission.model.Users;
15 16  
... ... @@ -48,8 +49,9 @@
48 49 @Autowired
49 50 private BabyBookbuildingFacade babyBookbuildingFacade;
50 51  
  52 + @Autowired
  53 + private PatientServiceFacade patientServiceFacade;
51 54  
52   -
53 55 private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
54 56  
55 57 private static Map<String, List> babyMap = new HashMap<>();
... ... @@ -277,6 +279,10 @@
277 279 request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
278 280 }
279 281 }*/
  282 +
  283 + //标准服务开通
  284 + request.setSerInfos(patientServiceFacade.defaultServiceOpen());
  285 +
280 286 babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
281 287  
282 288 }catch (Exception e)
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java View file @ 6ae8ee8
... ... @@ -11,6 +11,7 @@
11 11 import com.lyms.platform.common.utils.StringUtils;
12 12 import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
13 13 import com.lyms.platform.operate.web.facade.MatDeliverFacade;
  14 +import com.lyms.platform.operate.web.facade.PatientServiceFacade;
14 15 import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
15 16 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
16 17 import com.lyms.platform.permission.model.Users;
... ... @@ -52,6 +53,9 @@
52 53 private BabyBookbuildingFacade babyBookbuildingFacade;
53 54  
54 55 @Autowired
  56 + private PatientServiceFacade patientServiceFacade;
  57 +
  58 + @Autowired
55 59 private QhdfyHisService qhdfyHisService;
56 60  
57 61 private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
... ... @@ -813,6 +817,9 @@
813 817 request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
814 818 }
815 819 }
  820 +
  821 + //标准服务开通
  822 + request.setSerInfos(patientServiceFacade.defaultServiceOpen());
816 823 babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
817 824 deleteFmHistoryRecord(item.getSyxh());
818 825 }catch (Exception e)
platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyFmService.java View file @ 6ae8ee8
... ... @@ -14,6 +14,7 @@
14 14 import com.lyms.platform.common.utils.StringUtils;
15 15 import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
16 16 import com.lyms.platform.operate.web.facade.MatDeliverFacade;
  17 +import com.lyms.platform.operate.web.facade.PatientServiceFacade;
17 18 import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
18 19 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
19 20 import com.lyms.platform.permission.model.Users;
20 21  
... ... @@ -52,9 +53,10 @@
52 53  
53 54 @Autowired
54 55 private BabyBookbuildingFacade babyBookbuildingFacade;
  56 + @Autowired
  57 + private PatientServiceFacade patientServiceFacade;
55 58  
56 59  
57   -
58 60 private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
59 61  
60 62 private static Map<String, List> babyMap = new HashMap<>();
... ... @@ -619,6 +621,9 @@
619 621 request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
620 622 }
621 623 }*/
  624 +
  625 + //标准服务开通
  626 + request.setSerInfos(patientServiceFacade.defaultServiceOpen());
622 627 babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
623 628  
624 629 }catch (Exception e)
platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyHisService.java View file @ 6ae8ee8
... ... @@ -66,7 +66,7 @@
66 66 public List<String> getZcVcCardNos(String vcCardNo)
67 67 {
68 68 List<String> vcCardNos = new ArrayList<>();
69   - List<DzReplace> list = findAllVcCarddNo(vcCardNo);
  69 + List<DzReplace> list = findAllVcCarddNo(getZcVcardNo(vcCardNo));
70 70  
71 71 if (CollectionUtils.isNotEmpty(list))
72 72 {
... ... @@ -84,6 +84,23 @@
84 84 }
85 85 return vcCardNos;
86 86 }
  87 +
  88 +
  89 + /**
  90 + * 诸城就诊卡号处理
  91 + * @param vcCardNo
  92 + * @return
  93 + */
  94 + private String getZcVcardNo(String vcCardNo) {
  95 + if (StringUtils.isNotEmpty(vcCardNo) && vcCardNo.length() > 7)
  96 + {
  97 + String no = "0000"+vcCardNo.substring(0,8);
  98 + System.out.println(no);
  99 + return no;
  100 + }
  101 + return vcCardNo;
  102 + }
  103 +
87 104  
88 105 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 6ae8ee8
... ... @@ -312,9 +312,10 @@
312 312  
313 313  
314 314 /**
  315 + * hospitalDepartmentTest
315 316 * 获取科室
316 317 */
317   - @RequestMapping(value = "/hospitalDepartmentTest", method = RequestMethod.GET)
  318 + @RequestMapping(value = "/deptTest", method = RequestMethod.GET)
318 319 @ResponseBody
319 320 public List getDepartment() {
320 321 List<Object> list = new ArrayList<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 6ae8ee8
... ... @@ -388,7 +388,8 @@
388 388 //承德查询lis
389 389 else if ("16".equals(HIS_VERSION))
390 390 {
391   - model.setVcCardNo(cdfyHisService.getPatientIdByVcCardNo(vcCardNo));
  391 + model.setVcCardNo(vcCardNo);
  392 + //model.setVcCardNo(cdfyHisService.getPatientIdByVcCardNo(vcCardNo));
392 393 }
393 394 //威县人民医院lis
394 395 else if ("20".equals(HIS_VERSION))
... ... @@ -550,7 +551,8 @@
550 551 //承德查询lis
551 552 else if ("16".equals(HIS_VERSION))
552 553 {
553   - vcCardNos.add(cdfyHisService.getPatientIdByVcCardNo(pat.getVcCardNo()));
  554 + vcCardNos.add(pat.getVcCardNo());
  555 +// vcCardNos.add(cdfyHisService.getPatientIdByVcCardNo(pat.getVcCardNo()));
554 556 }
555 557 else
556 558 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 6ae8ee8
... ... @@ -328,11 +328,13 @@
328 328 MatDeliverQuery query = new MatDeliverQuery();
329 329 query.setId(deliverAddRequest.getId());
330 330 query.setYn(YnEnums.YES.getId());
331   - List<MaternalDeliverModel> results = matDeliverService.query(matDeliverQuery);
  331 + List<MaternalDeliverModel> results = matDeliverService.query(query);
332 332  
333 333 matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
334   -
335   - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, results.get(0), OptActionEnums.UPDATE.getId(), "修改分娩");
  334 + if (CollectionUtils.isNotEmpty(results))
  335 + {
  336 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, results.get(0), OptActionEnums.UPDATE.getId(), "修改分娩");
  337 + }
336 338  
337 339 if (null != deliverAddRequest.getDueDate()) {
338 340 Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 6ae8ee8
... ... @@ -778,6 +778,21 @@
778 778 return baseResponse;
779 779 }
780 780  
  781 + /**
  782 + * 默认服务开通
  783 + * @return
  784 + */
  785 + public List<Map<String, String>> defaultServiceOpen()
  786 + {
  787 + //标准服务开通
  788 + List<Map<String, String>> serInfos = new ArrayList<>();
  789 + Map<String, String> serMap = new HashMap<>();
  790 + serMap.put("serType", String.valueOf(PatientSerEnums.SerTypeEnums.babyBzfw.getId()));
  791 + serInfos.add(serMap);
  792 + return serInfos;
  793 + }
  794 +
  795 +
781 796  
782 797 /**
783 798 * 同步医院医生服务价格配置
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 6ae8ee8
... ... @@ -305,10 +305,6 @@
305 305 //用于存在没有机构的区域Id
306 306 List<String> addrId = new ArrayList<>();
307 307  
308   - //区域权限id
309   -// List<String> childsId = getAreaPermission(userId, addrType);
310   -// basicQuery.setIds(childsId);
311   -
312 308 //获取地址列表
313 309 List<BasicConfig> configList = basicConfigService.queryBasicConfig(basicQuery);
314 310  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 6ae8ee8
... ... @@ -61,6 +61,7 @@
61 61 // urls.put("area-weixian-api.healthbaby.com.cn:12356","威县");
62 62 urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
63 63 urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼");
  64 + urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院");
64 65 }
65 66  
66 67 @Autowired
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java View file @ 6ae8ee8
... ... @@ -74,7 +74,8 @@
74 74 //承德查询lis
75 75 else if ("16".equals(HIS_VERSION))
76 76 {
77   - patientsQuery.setVcCardNo(cdfyHisService.getPatientIdByVcCardNo(lisReportModel.getVcCardNo()));
  77 + patientsQuery.setVcCardNo(lisReportModel.getVcCardNo());
  78 + //patientsQuery.setVcCardNo(cdfyHisService.getPatientIdByVcCardNo(lisReportModel.getVcCardNo()));
78 79 }
79 80 else
80 81 {
platform-operate-api/src/main/resources/config.properties View file @ 6ae8ee8
... ... @@ -2,24 +2,12 @@
2 2 #center_base_url=https://weixin-push-save.healthbaby.com.cn
3 3 center_base_url=https://push.stage.platform.healthbaby.com.cn
4 4  
5   -#德州代金券地址
6   -djq_url=http://127.0.0.1:9090/his/insertDzfyDjq
7   -
8 5 #区域平台访问短信中心的token
9 6 center_token=e0c56363-00d6-42ee-bbe0-23c553583062
10 7  
11   -#\u5C71\u4E1C\u5FB7\u5DDE\u4F18\u60E0\u5238\u91D1\u989D_shanDong dezhou youHuiQuan jinE
12   -shanDong_Dezhou_youHuiQuan_money_Number=500
13   -
14   -#医院ID 德州：1000000114，秦皇岛：216
15   -hospitalId=216
16   -
17 8 #His系统版本 0：未使用，1：桓台，2：新乐，3：青龙县医院，4：秦皇岛妇幼，5：抚宁妇幼, 6: 德州妇幼，7：南充中心医院
18 9 his_version=21
19 10  
20   -#统计中心url
21   -center_statistics_url=http://api.healthbaby.com.cn/
22   -
23 11 #TCP服务器端口
24 12 nio_server_port=8000
25 13 #TCP服务器是否启动 1:true,2:false
26 14  
... ... @@ -27,18 +15,10 @@
27 15 #TCP客户端是否启动 1:true,2:false
28 16 nio_client_start=2
29 17  
30   -#postser_url=http://api.meishengbb.com/initdata/reser
31   -postser_url=http://devmmsapi.qinhuangdao.healthbaby.com.cn:18019/initdata/reser
32   -
33   -
34   -#区域统计地址
35   -area_count_url=192.168.1.32:1521
36   -
37 18 #同步mysql数据到各个区域的地址,多个用逗号隔开 如：https://area-qhd-api.healthbaby.com.cn:18019/syncMysqlData,https://area-dz-api.healthbaby.com.cn:12356/syncMysqlData
38 19 sync_mysql_data_url=
39 20  
40 21 platform.operate.api.validate.url=http://localhost:8080/
41   -
42 22  
43 23 #威海虚拟叫号语音机器地址
44 24 virtual_call_url=http://localhost:8090/Voice.ashx