zjh 2024/07/3-1

zjh

2024-07-03 ce3a4e08eb570bc0f928b6b5af4f615373a19c46

 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);
@@ -402,6 +402,8 @@
                        hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
                        hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
                        hysqd.setSqdh(jsonObject.getStr("SQDBH"));
                        hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
                        hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
                        if (ltkjHysqdService.save(hysqd)) {
                            Map<String,Object> hashMap=new HashMap<>();
                            hashMap.put("jybgid",hysqd.getTmh());
@@ -431,6 +433,7 @@
                                bgd.setShsj(js.getStr("BGRQ"));
                                bgd.setShsj(js.getStr("BGRQ"));
                                bgd.setShys(js.getStr("SHRBH"));
                                bgd.setShysmc(js.getStr("SHRXM"));
                                bgd.setYcbz(js.getStr("YCTS"));
//                            bgd.setTpurl(js.getStr(""));
                                ltkjHybgdService.save(bgd);
@@ -703,19 +706,29 @@
                if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
                        String metering = null;
                        if (null == byId) {
                            detailService.removeById(tjOrderDetail.getOrderDetailId());
                        } else {
                            metering = byId.getProMetering();
                            tjOrderDetail.setProject(byId);
                        }
                        List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
                        if (list2.size() == 0) {
                            tjOrderDetail.setStandard(new TjStandard());
                            TjStandard standard = new TjStandard();
                            if (StrUtil.isNotBlank(metering))
                                standard.setCompany(metering);
                            tjOrderDetail.setStandard(standard);
                        } else if (list2.size() == 1) {
                            tjOrderDetail.setStandard(list2.get(0));
                            TjStandard standard = list2.get(0);
                            if (StrUtil.isNotBlank(metering) && StrUtil.isBlank(standard.getCompany()))
                                standard.setCompany(metering);
                            tjOrderDetail.setStandard(standard);
                        } else {
                            final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
                            TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(), ageType, String.valueOf(tjOrderDetail.getProId()));
                            if (StrUtil.isNotBlank(metering) && StrUtil.isBlank(tjStandard1.getCompany()))
                                tjStandard1.setCompany(metering);
                            tjOrderDetail.setStandard(tjStandard1);
                        }
                    }
@@ -784,6 +797,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 +815,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()+"]");