jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8b42bc18d881db91eecb75837881bced77e8efc5

Authored by yangfei
1 parent 927e441406
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

追访

Showing 2 changed files with 39 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java View file @ 8b42bc1
... ... @@ -188,9 +188,7 @@
188 188  
189 189 List<List<String>> allAntExList = (List<List<String>>) map.get("antExData");
190 190  
191   - NodeCollection allTables = doc.getChildNodes(NodeType.TABLE, true); //拿到所有表格
192   -
193   -
  191 + // NodeCollection allTables = doc.getChildNodes(NodeType.TABLE, true); //拿到所有表格
194 192 DocumentBuilder builder = new DocumentBuilder(doc);
195 193  
196 194 List widthList = new ArrayList();
... ... @@ -219,7 +217,7 @@
219 217 builder.endRow();
220 218 }
221 219  
222   - Table table = (Table) allTables.get(0); //拿到表格
  220 + // Table table = (Table) allTables.get(0); //拿到表格
223 221 /*for(int i=0; i<allAntExList.size(); i++) {
224 222 Row r2 = new Row(doc);
225 223 for (int a =0;a<allAntExList.get(i).size();a++) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 8b42bc1
... ... @@ -2923,22 +2923,52 @@
2923 2923  
2924 2924 antExChu.add(DateUtil.getyyyy_MM_dd(an.getCheckTime()));
2925 2925 antExChu.add(ResolveUtils.getPregnancyWeek(patients.getLastMenses(), an.getCheckTime()));
2926   - String hightRiskStr = basicConfigService.getScreenResult(JsonUtil.jkstr2Obj(an.getHighrisk(), List.class));
2927   - antExChu.add(hightRiskStr);
  2926 + // String hightRiskStr = basicConfigService.getScreenResult(JsonUtil.jkstr2Obj(an.getHighrisk(), List.class));
2928 2927  
2929   - List list2 = JsonUtil.toList(an.getHighrisk(), List.class);
2930   - HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list2, true);
2931 2928  
  2929 + // List list2 = JsonUtil.toList(an.getHighrisk(), List.class);
  2930 + // HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list2, true);
  2931 +
  2932 + // for (int i = 0;i<highScoreResult.getLevel().size();i++) {
  2933 + // Map<String, Object> mp = (Map<String, Object>) highScoreResult.getLevel().get(i);
  2934 + // sbLev.add(mp.get("name"));
  2935 + // }
  2936 +
2932 2937 Set sbLev = new HashSet();
2933   - for (int i = 0;i<highScoreResult.getLevel().size();i++) {
2934   - Map<String, Object> mp = (Map<String, Object>) highScoreResult.getLevel().get(i);
2935   - sbLev.add(mp.get("name"));
  2938 + Set riskName = new HashSet();
  2939 +
  2940 + Map<String, Object> riskMap = new HashMap<>();
  2941 + //处理高危因素
  2942 + getRisk(an.getHighrisk(), an.getOtherHighRisk(), riskMap);
  2943 +
  2944 + if(riskMap.get("highRisk")!=null){
  2945 + List<Map<String, Object>> riksList = (List<Map<String, Object>>) riskMap.get("highRisk");
  2946 + for(Map<String,Object> risk:riksList){
  2947 + if(String.valueOf(risk.get("color")).contains("yellow")){
  2948 + sbLev.add("黄色");
  2949 + }else if(String.valueOf(risk.get("color")).contains("orange")){
  2950 + sbLev.add("橙色");
  2951 + }else if(String.valueOf(risk.get("color")).contains("red")){
  2952 + sbLev.add("红色");
  2953 + }else if(String.valueOf(risk.get("color")).contains("purple")){
  2954 + sbLev.add("紫色");
  2955 + }
  2956 + riskName.add(risk.get("name"));
  2957 + }
2936 2958 }
  2959 +
2937 2960 if(CollectionUtils.isNotEmpty(sbLev)){
  2961 + antExChu.add(riskName.toString());
  2962 + }else{
  2963 + antExChu.add("-");
  2964 + }
  2965 +
  2966 + if(CollectionUtils.isNotEmpty(sbLev)){
2938 2967 antExChu.add(sbLev.toString());
2939 2968 }else{
2940 2969 antExChu.add("健康");
2941 2970 }
  2971 +
2942 2972 antExChu.add(an.getTreatOpinion()==null?" ":an.getTreatOpinion());
2943 2973 antExChu.add(organization.getName());
2944 2974 String doctName = "";