jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e0b7edccec2ba35a8efc00e6128d117f22f8465b

Authored by wangbo
1 parent 8e5270803e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

回显字段添加

Showing 4 changed files with 103 additions and 107 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java View file @ e0b7edc
... ... @@ -2,12 +2,9 @@
2 2  
3 3 import com.lyms.platform.common.annotation.TokenRequired;
4 4 import com.lyms.platform.common.base.BaseController;
5   -import com.lyms.platform.common.base.LoginContext;
6 5 import com.lyms.platform.common.constants.ErrorCodeConstants;
7   -import com.lyms.platform.common.result.BaseResponse;
8 6 import com.lyms.platform.common.utils.ResultUtils;
9 7 import com.lyms.platform.common.utils.StringUtils;
10   -import com.lyms.platform.operate.web.facade.AutoMatchFacade;
11 8 import com.lyms.platform.operate.web.result.FrontEndResult;
12 9 import com.lyms.platform.operate.web.utils.CollectionUtils;
13 10 import com.lyms.platform.permission.model.CheckItemManage;
... ... @@ -19,7 +16,6 @@
19 16 import org.springframework.stereotype.Controller;
20 17 import org.springframework.web.bind.annotation.*;
21 18  
22   -import javax.servlet.http.HttpServletRequest;
23 19 import javax.servlet.http.HttpServletResponse;
24 20 import java.util.ArrayList;
25 21 import java.util.Date;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ e0b7edc
... ... @@ -317,8 +317,7 @@
317 317 model.setHospitalId(hospitalId);
318 318  
319 319 //补录就不验证是否同一天复诊
320   - if (!StringUtils.isNotEmpty(antExAddRequest.getSupplement()))
321   - {
  320 + if (!StringUtils.isNotEmpty(antExAddRequest.getSupplement())) {
322 321 AntExQuery antExQuery = new AntExQuery();
323 322 antExQuery.setYn(YnEnums.YES.getId());
324 323 antExQuery.setParentId(antExAddRequest.getParentId());
... ... @@ -358,7 +357,7 @@
358 357 * @param antExamModel
359 358 * @param hospitalId
360 359 */
361   - public void updateAutoData(final AntenatalExaminationModel antExamModel,final AntExAddRequest antExAddRequest, final String hospitalId) {
  360 + public void updateAutoData(final AntenatalExaminationModel antExamModel, final AntExAddRequest antExAddRequest, final String hospitalId) {
362 361 commonThreadPool.execute(new Runnable() {
363 362 @Override
364 363 public void run() {
365 364  
366 365  
... ... @@ -686,18 +685,17 @@
686 685 }
687 686  
688 687 //处理数据自动流转
689   - updateChuAutoData(antExChuModel,excAddRequest, hospitalId, userId);
  688 + updateChuAutoData(antExChuModel, excAddRequest, hospitalId, userId);
690 689  
691 690 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
692 691 }
693 692  
694 693 /**
695   - *
696   - * @param hospitalId 院内系统的医院id
  694 + * @param hospitalId 院内系统的医院id
697 695 * @param patientId
698 696 * @param doctorId
699 697 */
700   - public void createdSengMsg1(String hospitalId,String patientId,String doctorId){
  698 + public void createdSengMsg1(String hospitalId, String patientId, String doctorId) {
701 699 Patients patient = patientsService.findOnePatientById(patientId);
702 700 //判断医院是否启动和对应的服务项是否启用
703 701 SmsConfigModel configModel = new SmsConfigModel();
... ... @@ -733,11 +731,10 @@
733 731 Integer serviceType = 0;
734 732 Integer serviceStatus = 0;
735 733  
736   - if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId()
737   - && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()))
738   - {
739   - serviceType = ServiceTypeEnums.ALL_SERVICE.getId();
740   - serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId();
  734 + if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId()
  735 + && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())) {
  736 + serviceType = ServiceTypeEnums.ALL_SERVICE.getId();
  737 + serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId();
741 738 }
742 739  
743 740 //根据服务状态和服务类型获取可以发送的模板
744 741  
... ... @@ -860,11 +857,10 @@
860 857 Integer serviceType = 0;
861 858 Integer serviceStatus = 0;
862 859  
863   - if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId()
864   - && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()))
865   - {
  860 + if (patient.getServiceStatus() == null || (patient.getServiceStatus() == ServiceStatusEnums.NO_OPEN.getId()
  861 + && patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())) {
866 862 serviceType = ServiceTypeEnums.ALL_SERVICE.getId();
867   - serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId();
  863 + serviceStatus = ServiceStatusEnums.ALL_NO_OPEN.getId();
868 864 }
869 865  
870 866 //根据服务状态和服务类型获取可以发送的模板
... ... @@ -951,7 +947,7 @@
951 947 * @param excAddRequest
952 948 * @param hospitalId
953 949 */
954   - public void updateChuAutoData(final AntExChuModel antExChuModel ,final AntExcAddRequest excAddRequest, final String hospitalId, final Integer userId) {
  950 + public void updateChuAutoData(final AntExChuModel antExChuModel, final AntExcAddRequest excAddRequest, final String hospitalId, final Integer userId) {
955 951 commonThreadPool.execute(new Runnable() {
956 952 @Override
957 953 public void run() {
... ... @@ -1855,7 +1851,7 @@
1855 1851 PatientsQuery patientsQuery = new PatientsQuery();
1856 1852 patientsQuery.setSource(patients.getId());
1857 1853 patientsQuery.setBuildType(1);
1858   - System.out.println("查询条件："+patientsQuery.convertToQuery().convertToMongoQuery());
  1854 + System.out.println("查询条件：" + patientsQuery.convertToQuery().convertToMongoQuery());
1859 1855 List<Patients> patients1 = patientsService.queryPatient(patientsQuery);
1860 1856 if (CollectionUtils.isNotEmpty(patients1)) {
1861 1857 for (Patients ps : patients1) {
... ... @@ -1897,7 +1893,7 @@
1897 1893 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
1898 1894 matDeliverQuery.setYn(YnEnums.YES.getId());
1899 1895  
1900   - matDeliverQuery.setParentIdList(patientIds);
  1896 + matDeliverQuery.setParentIdList(patientIds);
1901 1897 List<MaternalDeliverModel> l = matDeliverService.query(matDeliverQuery);
1902 1898 if (CollectionUtils.isNotEmpty(l)) {
1903 1899 MaternalDeliverModel model = l.get(0);
... ... @@ -2134,7 +2130,6 @@
2134 2130 }
2135 2131  
2136 2132  
2137   -
2138 2133 public class SortIn {
2139 2134  
2140 2135 public SortIn(Patients patients) {
... ... @@ -2514,8 +2509,8 @@
2514 2509 * @param type 类型 1 孕妇 3 产妇 -1 不区分
2515 2510 * @param outHospital 是否需要查外院
2516 2511 */
2517   - public Patients findOnePatient(String cardNo, String vcCardNo,List<String> hospitalIds, Integer
2518   - type, boolean outHospital, boolean isEnable,String hospitalId) {
  2512 + public Patients findOnePatient(String cardNo, String vcCardNo, List<String> hospitalIds, Integer
  2513 + type, boolean outHospital, boolean isEnable, String hospitalId) {
2519 2514 PatientsQuery patientsQuery = new PatientsQuery();
2520 2515 if (StringUtils.isNotEmpty(cardNo)) {
2521 2516 patientsQuery.setCardNo(cardNo);
2522 2517  
2523 2518  
2524 2519  
... ... @@ -2540,18 +2535,17 @@
2540 2535 Patients patients = null;
2541 2536 List<Patients> list = patientsService.queryPatient1(patientsQuery, "modified");
2542 2537 if (CollectionUtils.isNotEmpty(list)) {
2543   - if(list.size()==1){
  2538 + if (list.size() == 1) {
2544 2539 return list.get(0);
2545   - }else{
  2540 + } else {
2546 2541  
2547 2542 Patients mainPatient = null;
2548 2543  
2549   - for(Patients ps:list){
2550   - if (StringUtils.isEmpty(ps.getSource()))
2551   - {
  2544 + for (Patients ps : list) {
  2545 + if (StringUtils.isEmpty(ps.getSource())) {
2552 2546 mainPatient = ps;
2553 2547 }
2554   - if(hospitalId.equals(ps.getHospitalId())){
  2548 + if (hospitalId.equals(ps.getHospitalId())) {
2555 2549 return ps;
2556 2550 }
2557 2551 }
2558 2552  
... ... @@ -2661,13 +2655,12 @@
2661 2655 if (StringUtils.isEmpty(queryRequest.getCardNo()) && StringUtils.isEmpty(queryRequest.getVcCardNo())) {
2662 2656 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件");
2663 2657 }
2664   - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), currentGroupHospital, 1, false, og.getbStatus() == 1,hospitalId);
  2658 + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), currentGroupHospital, 1, false, og.getbStatus() == 1, hospitalId);
2665 2659 //查询产妇数据
2666 2660 // patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospitalId, 1, false, null, false);
2667 2661 }
2668 2662  
2669   - if (StringUtils.isNotEmpty(queryRequest.getSupplement()))
2670   - {
  2663 + if (StringUtils.isNotEmpty(queryRequest.getSupplement())) {
2671 2664 if (null == patients) {
2672 2665 if (StringUtils.isNotEmpty(queryRequest.getCardNo()) || StringUtils.isNotEmpty(queryRequest.getVcCardNo())) {
2673 2666 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
... ... @@ -2677,9 +2670,7 @@
2677 2670 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("该孕妇在系统中没有档案，请新建档");
2678 2671 }
2679 2672 }
2680   - }
2681   - else
2682   - {
  2673 + } else {
2683 2674 if (null == patients) {
2684 2675 if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) {
2685 2676 patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1);
... ... @@ -2694,7 +2685,6 @@
2694 2685 }
2695 2686  
2696 2687  
2697   -
2698 2688 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
2699 2689  
2700 2690 matDeliverQuery.setPid(patients.getPid());
2701 2691  
2702 2692  
... ... @@ -2716,14 +2706,11 @@
2716 2706  
2717 2707 List<SortIn> sortList = new ArrayList<>();
2718 2708  
2719   - if (StringUtils.isNotEmpty(queryRequest.getSupplement()))
2720   - {
  2709 + if (StringUtils.isNotEmpty(queryRequest.getSupplement())) {
2721 2710 if (fmPatient != null) {
2722   - sortList.add(new SortIn(fmPatient,""));
  2711 + sortList.add(new SortIn(fmPatient, ""));
2723 2712 }
2724   - }
2725   - else
2726   - {
  2713 + } else {
2727 2714 if (fmPatient != null) {
2728 2715 fmPatient.setBookbuildingDate(fmPatient.getFmDate());
2729 2716 sortList.add(new SortIn(fmPatient));
... ... @@ -2742,7 +2729,6 @@
2742 2729 }
2743 2730  
2744 2731  
2745   -
2746 2732 AntexListResult antexListResult = new AntexListResult();
2747 2733 String pid = patients.getId();
2748 2734  
2749 2735  
2750 2736  
2751 2737  
... ... @@ -2778,23 +2764,16 @@
2778 2764 AntExChuQuery antExChuQuery = new AntExChuQuery();
2779 2765  
2780 2766 //http://jira.healthbaby.com.cn/browse/WEB-2733
2781   - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo()))
2782   - {
  2767 + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) {
2783 2768 if (StringUtils.isNotEmpty(queryRequest.getSupplement())) {
2784 2769 antExChuQuery.setPid(patients.getPid());
2785   - }
2786   - else
2787   - {
  2770 + } else {
2788 2771 antExChuQuery.setParentId(patients.getId());
2789 2772 }
2790 2773  
2791   - }
2792   - else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
2793   - {
  2774 + } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) {
2794 2775 antExChuQuery.setParentId(patients.getId());
2795   - }
2796   - else
2797   - {
  2776 + } else {
2798 2777 antExChuQuery.setPid(patients.getPid());
2799 2778 }
2800 2779  
2801 2780  
2802 2781  
2803 2782  
2804 2783  
... ... @@ -2817,27 +2796,19 @@
2817 2796  
2818 2797 //http://jira.healthbaby.com.cn/browse/WEB-2733
2819 2798  
2820   - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo()))
2821   - {
  2799 + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) {
2822 2800 if (StringUtils.isNotEmpty(queryRequest.getSupplement())) {
2823 2801 antExQuery.setPid(patients.getPid());
2824   - }
2825   - else
2826   - {
  2802 + } else {
2827 2803 antExQuery.setParentId(patients.getId());
2828 2804 }
2829   - }
2830   - else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
2831   - {
  2805 + } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) {
2832 2806 antExQuery.setParentId(patients.getId());
2833   - }
2834   - else
2835   - {
  2807 + } else {
2836 2808 antExQuery.setPid(patients.getPid());
2837 2809 }
2838 2810  
2839 2811  
2840   -
2841 2812 antExQuery.setStart(max);
2842 2813 //查询复诊记录
2843 2814 List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
2844 2815  
2845 2816  
... ... @@ -2853,16 +2824,11 @@
2853 2824 antExQuery1.setHospitalId(hospitalId);
2854 2825  
2855 2826 //http://jira.healthbaby.com.cn/browse/WEB-2733
2856   - if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo()))
2857   - {
  2827 + if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo())) {
2858 2828 antExQuery1.setParentId(patients.getId());
2859   - }
2860   - else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
2861   - {
  2829 + } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) {
2862 2830 antExQuery1.setParentId(patients.getId());
2863   - }
2864   - else
2865   - {
  2831 + } else {
2866 2832 antExQuery1.setPid(patients.getPid());
2867 2833 }
2868 2834  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ e0b7edc
... ... @@ -61,7 +61,7 @@
61 61 */
62 62 private String quickenRemark;
63 63 //筛查结果
64   - private List<Map<String,Object>> screenResult;
  64 + private List<Map<String, Object>> screenResult;
65 65 //结果补充
66 66 private String resultSupple;
67 67  
68 68  
69 69  
... ... @@ -279,10 +279,11 @@
279 279 public String electr;
280 280  
281 281  
  282 + /**
  283 + * 承德区域功能
  284 + *****/
282 285  
283   - /**承德区域功能*****/
284 286  
285   -
286 287 //血红蛋白值
287 288 //private String xhdb;
288 289 //白细胞计数值
289 290  
... ... @@ -340,7 +341,19 @@
340 341  
341 342 //hit抗体检测
342 343 private String hivkt;
  344 + /**
  345 + * 产检项
  346 + */
  347 + private String configItemId;
343 348  
  349 + public String getConfigItemId() {
  350 + return configItemId;
  351 + }
  352 +
  353 + public void setConfigItemId(String configItemId) {
  354 + this.configItemId = configItemId;
  355 + }
  356 +
344 357 public String getBxbjs() {
345 358 return bxbjs;
346 359 }
... ... @@ -896,6 +909,10 @@
896 909 setTextpjbc(destModel.getTextpjbc());
897 910 setS75gdgtt(destModel.getS75gdgtt());
898 911 setJzxgn(destModel.getJzxgn());
  912 + /**
  913 + * 产检项
  914 + * */
  915 + setConfigItemId(destModel.getConfigItemId());
899 916 try {
900 917 setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
901 918 } catch (Exception e) {
902 919  
903 920  
904 921  
... ... @@ -923,18 +940,18 @@
923 940 if (destModel.getOtherRisk().startsWith("[") && destModel.getOtherRisk().endsWith("]")) {
924 941 List<Map> list2 = JsonUtil.toList(destModel.getOtherRisk(), Map.class);
925 942 Iterator<Map> listIterator = list2.iterator();
926   - while (listIterator.hasNext()){
  943 + while (listIterator.hasNext()) {
927 944 Map map = listIterator.next();
928 945 suppleOtherHigh(map);
929   - if(map.isEmpty()){
  946 + if (map.isEmpty()) {
930 947 listIterator.remove();
931 948 }
932 949 }
933 950 setOtherRisk(list2);
934   - } else if(org.apache.commons.lang.StringUtils.isNotEmpty(destModel.getOtherRisk())){
  951 + } else if (org.apache.commons.lang.StringUtils.isNotEmpty(destModel.getOtherRisk())) {
935 952 Map map = JsonUtil.str2Obj(destModel.getOtherRisk(), Map.class);
936 953 suppleOtherHigh(map);
937   - if(!map.isEmpty()){
  954 + if (!map.isEmpty()) {
938 955 setOtherRisk(Arrays.asList(new Object[]{map}));
939 956 }
940 957  
941 958  
... ... @@ -989,14 +1006,14 @@
989 1006 Object idObj1 = map.get("fyyse");
990 1007 if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
991 1008 map.put("color", HosptialHighRiskFacade.colorMap.get(idObj1));
992   - }else{
  1009 + } else {
993 1010 map.remove("fyyse");
994 1011 }
995 1012 //风险评分
996 1013 Object idObj = map.get("fxpf");
997 1014 if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) {
998 1015 map.put("scoer", HosptialHighRiskFacade.scoreMap.get(idObj));
999   - }else {
  1016 + } else {
1000 1017 map.remove("fxpf");
1001 1018 }
1002 1019 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ e0b7edc
... ... @@ -92,7 +92,7 @@
92 92 private String quickenRemark;
93 93  
94 94 //筛查结果
95   - private List<Map<String, Object>> screenResult;
  95 + private List<Map<String, Object>> screenResult;
96 96 //结果补充
97 97 private String resultSupple;
98 98  
99 99  
... ... @@ -161,22 +161,35 @@
161 161 * 基本信息
162 162 **/
163 163 private String id;
  164 + /**
  165 + * 产检项
  166 + */
  167 + private String configItemId;
  168 +
  169 + public String getConfigItemId() {
  170 + return configItemId;
  171 + }
  172 +
  173 + public void setConfigItemId(String configItemId) {
  174 + this.configItemId = configItemId;
  175 + }
  176 +
164 177 /* //名字
165   - private String name;
166   - //年龄
167   - private Integer age;
168   - //孕周
169   - private String dueWeek;
170   - //预产期
171   - private String yChanQi;
172   - //手机号
173   - private String phone;
174   - //高危因素
175   - private String riskFactor;
176   - //高危评分
177   - private String riskScore;
178   - //备注
179   - private String remarks;*/
  178 + private String name;
  179 + //年龄
  180 + private Integer age;
  181 + //孕周
  182 + private String dueWeek;
  183 + //预产期
  184 + private String yChanQi;
  185 + //手机号
  186 + private String phone;
  187 + //高危因素
  188 + private String riskFactor;
  189 + //高危评分
  190 + private String riskScore;
  191 + //备注
  192 + private String remarks;*/
180 193 //末次月经
181 194 private String lastMenses;
182 195 //预产期
... ... @@ -1619,6 +1632,10 @@
1619 1632 setCervicalSele(antExChuModel.getCervicalSele());
1620 1633 setUterusSele(antExChuModel.getUterusSele());
1621 1634 setFujianSele(antExChuModel.getFujianSele());
  1635 + /**
  1636 + * 产检项
  1637 + * */
  1638 + setConfigItemId(antExChuModel.getConfigItemId());
1622 1639 // //早孕期病毒检测
1623 1640 // private String zyqbdjc;
1624 1641 // //nt检查
1625 1642  
... ... @@ -1723,10 +1740,10 @@
1723 1740 List<Map> list2 = JsonUtil.toList(antExChuModel.getOtherHighRisk(), Map.class);
1724 1741  
1725 1742 Iterator<Map> listIterator = list2.iterator();
1726   - while (listIterator.hasNext()){
  1743 + while (listIterator.hasNext()) {
1727 1744 Map map = listIterator.next();
1728 1745 suppleOtherHigh(map);
1729   - if(map.isEmpty()){
  1746 + if (map.isEmpty()) {
1730 1747 listIterator.remove();
1731 1748 }
1732 1749 }
... ... @@ -1734,7 +1751,7 @@
1734 1751 } else {
1735 1752 Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class);
1736 1753 suppleOtherHigh(map);
1737   - if(!map.isEmpty()){
  1754 + if (!map.isEmpty()) {
1738 1755 setOtherHighRisk(Arrays.asList(new Object[]{map}));
1739 1756 }
1740 1757 }
1741 1758  
... ... @@ -1814,14 +1831,14 @@
1814 1831 Object idObj1 = map.get("fyyse");
1815 1832 if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
1816 1833 map.put("color", HosptialHighRiskFacade.colorMap.get(idObj1));
1817   - }else{
  1834 + } else {
1818 1835 map.remove("fyyse");
1819 1836 }
1820 1837 //风险评分
1821 1838 Object idObj = map.get("fxpf");
1822 1839 if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) {
1823 1840 map.put("scoer", HosptialHighRiskFacade.scoreMap.get(idObj));
1824   - }else{
  1841 + } else {
1825 1842 map.remove("fxpf");
1826 1843 }
1827 1844 }