修复箭头问题增加单位返回

zhaowenxuan

2024-07-01 c976a54131a31143c174c475c8050427946eb4a8

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -366,13 +366,13 @@
//                    }
//                }
//                for (String baoGaoDan : baoGaoDans) {
//                    Date dates = new Date();
                    Date dates = new Date();
                    Map<String,Object> map=new HashMap<>();
                    map.put("his_registration_id",order.getCardId());
                    map.put("ksbm","");
                    map.put("pationid","");
                    map.put("ksrq",DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
                    map.put("jsrq",DateUtil.format(DateUtil.endOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
                    map.put("jsrq",DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
                    map.put("pagecount",10);
                    map.put("page",1);
                    AjaxResult result = controller.Getlabreportinfo(map);
@@ -707,6 +707,9 @@
                            detailService.removeById(tjOrderDetail.getOrderDetailId());
                        } else {
                            tjOrderDetail.setProject(byId);
                            String metering = byId.getProMetering();
                            if (StrUtil.isNotBlank(metering))
                                tjOrderDetail.setUnit(metering);
                        }
                        List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
                        if (list2.size() == 0) {
@@ -784,6 +787,9 @@
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        if(remark.getProId().equals(tjOrderDetail.getProId())){
                            String ckfw = tjOrderDetail.getStanId();
                            if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())){
                                ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(),"");
                            }
                            if (StrUtil.isNotBlank(ckfw)) {
                                try {
                                    Integer.parseInt(tjOrderDetail.getYcbz());
@@ -799,7 +805,9 @@
                                    }else {
                                        tjOrderDetail.setYcbz("");
                                    }
                                } catch (NumberFormatException ignored) { }
                                } catch (NumberFormatException ignored) {
                                    ignored.printStackTrace();
                                }
                            }
                            if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
                                tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");