Commit 9ffc6e55f60d292dd8e0e25181601ef388b4de7a
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
9ffc6e5
| ... | ... | @@ -6,6 +6,7 @@ |
| 6 | 6 | import com.lyms.hospitalapi.pojo.CheckItemResponse; |
| 7 | 7 | import com.lyms.hospitalapi.pojo.CheckResponse; |
| 8 | 8 | import com.lyms.hospitalapi.pojo.CheckType; |
| 9 | +import com.lyms.hospitalapi.qhdfy.QhdfyHisService; | |
| 9 | 10 | import com.lyms.platform.biz.service.*; |
| 10 | 11 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 11 | 12 | import com.lyms.platform.common.enums.*; |
| 12 | 13 | |
| ... | ... | @@ -55,10 +56,14 @@ |
| 55 | 56 | private LisService lisService; |
| 56 | 57 | |
| 57 | 58 | @Autowired |
| 59 | + private QhdfyHisService qhdfyHisService; | |
| 60 | + | |
| 61 | + @Autowired | |
| 58 | 62 | @Qualifier("commonThreadPool") |
| 59 | 63 | private ThreadPoolTaskExecutor commonThreadPool; |
| 60 | 64 | |
| 61 | 65 | public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); |
| 66 | + public static final String run_mode = PropertiesUtils.getPropertyValue("run.mode"); | |
| 62 | 67 | |
| 63 | 68 | /** |
| 64 | 69 | * 获取lis和ris检验报告 |
| ... | ... | @@ -771,7 +776,7 @@ |
| 771 | 776 | isQuery = true; |
| 772 | 777 | } |
| 773 | 778 | //如果不为上面的医院就直接返回 |
| 774 | - if (!isQuery) | |
| 779 | + if (!isQuery || "2".equals(run_mode)) | |
| 775 | 780 | { |
| 776 | 781 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map); |
| 777 | 782 | } |
| ... | ... | @@ -779,7 +784,15 @@ |
| 779 | 784 | query.setTitles(titles); |
| 780 | 785 | query.setHospitalId(hospitalId); |
| 781 | 786 | query.setCheckTime(DateUtil.parseYMD(checkTime)); |
| 782 | - List<LisReportModel> lises = queryCheckLis(vcCardNo,phone,query); | |
| 787 | + List<LisReportModel> lises = null; | |
| 788 | + if ("216".equals(hospitalId)) | |
| 789 | + { | |
| 790 | + lises = qhdfyHisService.queryQhdCheckLisInfo(vcCardNo,phone,"('尿常规','[丙]血常规(24项)','血常规(24项)','血细胞分析（末梢）')", checkTime); | |
| 791 | + } | |
| 792 | + else | |
| 793 | + { | |
| 794 | + lises = queryCheckLis(vcCardNo,phone,query); | |
| 795 | + } | |
| 783 | 796 | |
| 784 | 797 | if (CollectionUtils.isNotEmpty(lises)) |
| 785 | 798 | { |
| ... | ... | @@ -800,6 +813,10 @@ |
| 800 | 813 | { |
| 801 | 814 | for(LisReportItemModel item : items) |
| 802 | 815 | { |
| 816 | + if (item == null) | |
| 817 | + { | |
| 818 | + continue; | |
| 819 | + } | |
| 803 | 820 | if ("尿蛋白".equals(item.getName())) |
| 804 | 821 | { |
| 805 | 822 | map1.put("ndb",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); |
| ... | ... | @@ -832,6 +849,10 @@ |
| 832 | 849 | { |
| 833 | 850 | for(LisReportItemModel item : items) |
| 834 | 851 | { |
| 852 | + if (item == null) | |
| 853 | + { | |
| 854 | + continue; | |
| 855 | + } | |
| 835 | 856 | if ("血红蛋白".equals(item.getName())) |
| 836 | 857 | { |
| 837 | 858 | map1.put("xhdb",item.getNumberResult()); |
| ... | ... | @@ -864,6 +885,10 @@ |
| 864 | 885 | { |
| 865 | 886 | for(LisReportItemModel item : items) |
| 866 | 887 | { |
| 888 | + if (item == null) | |
| 889 | + { | |
| 890 | + continue; | |
| 891 | + } | |
| 867 | 892 | if ("尿蛋白".equals(item.getName())) |
| 868 | 893 | { |
| 869 | 894 | map1.put("ndb",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); |
| ... | ... | @@ -897,6 +922,10 @@ |
| 897 | 922 | { |
| 898 | 923 | for(LisReportItemModel item : items) |
| 899 | 924 | { |
| 925 | + if (item == null) | |
| 926 | + { | |
| 927 | + continue; | |
| 928 | + } | |
| 900 | 929 | if ("血红蛋白".equals(item.getName())) |
| 901 | 930 | { |
| 902 | 931 | map1.put("xhdb",item.getNumberResult()); |