From 0ac41ddb2dc383d0076da6dfa85ddae9944218cc Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 15 一月 2025 15:08:29 +0800
Subject: [PATCH] 20250115

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java |  873 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 674 insertions(+), 199 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index fe72568..ee6a6e9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -2,11 +2,15 @@
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ltkj.common.core.domain.AjaxResult;
 import com.ltkj.common.core.domain.entity.SysUser;
 import com.ltkj.common.utils.SecurityUtils;
@@ -30,6 +34,7 @@
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /* @Authot:zjh
  * @Date:  2024-05-30
@@ -82,6 +87,8 @@
     private ITjSamplingService tjSamplingService;
     @Autowired
     private SamplingServiceApi samplingService;
+    @Autowired
+    private TbLisSqService tbLisSqService;
 
 
     //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
@@ -191,6 +198,381 @@
 
 
     //浣撴瀵筯is鐢宠鍗曡皟鐢ㄦ柟娉�
+//    public AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
+//        String dept = configService.selectConfigByKey("request_default_dept");
+//        String ysbm = configService.selectConfigByKey("request_default_ysbm");
+//        String ysmc = configService.selectConfigByKey("request_default_ysmc");
+//
+//        List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+//
+//        //妫�楠岀敵璇�
+//        OutpintestapplyDto dto = new OutpintestapplyDto();
+//        dto.setHisRegistrationId(cardId);
+//        dto.setSfzh(customer.getCusIdcard());
+//        dto.setSqysbm(ysbm);
+//        dto.setMzksbm(dept);
+//        dto.setSjrq(date);
+//        dto.setCzybm(ysbm);
+//        dto.setCzyksbm(dept);
+//        dto.setSfjz("0");
+//
+//        List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
+//        List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
+//        if (null != detailList && !detailList.isEmpty()) {
+//            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+//            wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
+////            wq.groupBy(TjProject::getHisXmbm);
+////            wq.in(TjProject::getDeptId, "241", "317");
+//            wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
+//            List<TjProject> projects = projectService.list(wq);
+//            if (null != projects && !projects.isEmpty()) {
+//                for (TjProject project : projects) {
+//                    if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+//                        if (null != project.getHisXmbm()) {
+//                            //TODO 杩欓噷detailsDto 鏀规垚浼犻�掓墍鏈夌殑灏忛」 妫�楠屾槸鍚堝苟涔嬪悗杩涜鍙戦�� 涓�涓牱鏈唬鐮佷竴娆¤姹�
+//                            // 鎵�鏈夌殑灏忛」鍏ㄩ儴娣诲姞鍒拌繖涓泦鍚堜箣涓�
+//                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+//                            detailsDto.setMxfyxmbm(project.getHisXmbm());
+//                            if (project.getSfzhfy().equals("Y")) {
+//                                detailsDto.setSfzhfy("1");
+//                            } else {
+//                                detailsDto.setSfzhfy("0");
+//                            }
+//                            detailsDto.setSl(project.getSl());
+//                            detailsDto.setProjg(project.getProPrice());
+//                            detailsDtos.add(detailsDto);
+//                        }
+//                        if(project.getProId()==1740177341251154377L){
+//                            OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+//                            detilsDto.setYpbm("00006670");
+//                            detilsDto.setPcbm("06");
+//                            detilsDto.setSl("1");
+//                            detilsDto.setDj("60");
+//                            detilsDto.setDcjl("1");
+//                            detilsDto.setPj("60");
+//                            detilsDto.setJj("60");
+//                            detilsDto.setJldw("");
+//                            detilsDto.setTjbm("");
+//                            detilsDto.setPs("");
+//                            detilsDto.setPsbm("");
+//                            detilsDto.setYyts("");
+//                            detilsDto.setXtph("");
+//                            detilsDto.setScph("");
+//                            detilsDto.setYpxq("");
+//                            detilsDto.setCdbm("");
+//                            detilsDto.setKfdw("");
+//                            detilsDto.setYfdw("");
+//                            detilsDto.setYysm("");
+//                            detilsDto.setFzbl("1");
+//                            detilsDto.setZh("0");
+//                            outpinmedicapplyDetilsDtos.add(detilsDto);
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        if (!detailsDtos.isEmpty()) {
+//            dto.setDetails(detailsDtos);
+//            AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
+//            String result5 = getAjaxResult(ajaxResult1);
+//            JSONObject object3 = getJSONObject(result5);
+//            String code3 = object3.getStr("ResultCode");
+//            if (code3.equals("0")) {
+//                List<OutpintestapplyDetailsDto> details = dto.getDetails();
+//                for (OutpintestapplyDetailsDto detail : details) {
+//                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+//                    tree.setCardId(dto.getHisRegistrationId());
+//                    tree.setPationid(customer.getPationId());
+//                    JSONObject resultData = object3.getJSONObject("ResultData");
+//                    tree.setSqdh(resultData.getStr("jysqdh"));
+//                    tree.setFyhj(resultData.getStr("fyhj"));
+//                    String mxfyxmbm = detail.getMxfyxmbm();
+//                    tree.setHisXmdm(mxfyxmbm);
+//                    tree.setType("妫�楠�");
+//                    tree.setService("his");
+//                    tree.setTjPrice(String.valueOf(detail.getProjg()));
+//                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
+//                    if (detail.getSfzhfy().equals("1"))
+//                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
+//                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
+//                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
+//                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
+//                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
+//                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
+//                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
+//                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
+//                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
+//                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
+//                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
+//                        tree.setXmfl(ejjfxmzd.getYjkmdm());
+//                    }
+//                    tree.setCreateTime(DateUtil.date());
+//                    ltkjJianchajianyanTreeService.save(tree);
+//                }
+//                // TODO 涓汉浠ュ強鍥綋 鏆備笉鍚戦噰鏍风鐞嗗啓鏁版嵁
+//                // HIS鍙戦�佹棤娉曞悎骞舵搷浣� 鏃犳硶鑾峰彇LIS鐨勬楠屽簭鍙� 鏉$爜鏃犳硶鎵撳嵃
+////                TjOrder tjOrder = orderService.getOrderByCardId(cardId);
+////                if(null !=tjOrder){
+////                    List<TjOrderDetail> dengJi = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+////                    tjSysAsyncService.addCaiYangDengJi(dengJi,!dengJi.isEmpty(),tjOrder, SecurityUtils.getLoginUser().getUser(), null);
+////                }
+//            }
+//        }
+//
+//        //闂ㄨ瘖妫�鏌ョ敵璇�
+//        OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
+//        outpinexamapplyDto.setHisRegistrationId(cardId);
+//        outpinexamapplyDto.setSfzh(customer.getCusIdcard());
+//        outpinexamapplyDto.setSqysbm(ysbm);
+//        outpinexamapplyDto.setMzksbm(dept);
+//        outpinexamapplyDto.setCzybm(ysbm);
+//        outpinexamapplyDto.setCzyksbm(dept);
+//        outpinexamapplyDto.setSfjz("0");
+////        List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+//        List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
+//        if (null != detailList && !detailList.isEmpty()) {
+//            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+//            wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
+//            wq.in(TjProject::getDeptId,deptService.getJcDeptIds());
+//            List<TjProject> projects = projectService.list(wq);
+//            if (null != projects && !projects.isEmpty()) {
+//                for (TjProject project : projects) {
+//                    if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+//                        if (null != project.getHisXmbm()) {
+//                            //TODO 杩欓噷鏀逛负灏忛」闆嗗悎 涔熸槸鎸夌収鍘熸湰鐨勬煡璇㈡墍鏈夌殑澶ч」 鐒跺悗鏍规嵁澶ч」鏌ュ嚭鑷繁鐨勫皬椤� 涓�涓ぇ椤逛负涓�娆¤姹�
+//                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+//                            detailsDto.setMxfyxmbm(project.getHisXmbm());
+//                            if (project.getSfzhfy().equals("Y")) {
+//                                detailsDto.setSfzhfy("1");
+//                            } else {
+//                                detailsDto.setSfzhfy("0");
+//                            }
+//                            detailsDto.setSl(project.getSl());
+//                            detailsDto.setProjg(project.getProPrice());
+//                            detailsDtoss.add(detailsDto);
+//                        }
+//                        if(project.getProId()==1740177341251154377L){
+//                            OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+//                            detilsDto.setYpbm("00006670");
+//                            detilsDto.setPcbm("06");
+//                            detilsDto.setSl("1");
+//                            detilsDto.setDj("60");
+//                            detilsDto.setDcjl("1");
+//                            detilsDto.setPj("60");
+//                            detilsDto.setJj("60");
+//                            detilsDto.setJldw("");
+//                            detilsDto.setTjbm("");
+//                            detilsDto.setPs("");
+//                            detilsDto.setPsbm("");
+//                            detilsDto.setYyts("");
+//                            detilsDto.setXtph("");
+//                            detilsDto.setScph("");
+//                            detilsDto.setYpxq("");
+//                            detilsDto.setCdbm("");
+//                            detilsDto.setKfdw("");
+//                            detilsDto.setYfdw("");
+//                            detilsDto.setYysm("");
+//                            detilsDto.setFzbl("1");
+//                            detilsDto.setZh("0");
+//                            outpinmedicapplyDetilsDtos.add(detilsDto);
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        if (detailsDtoss.size() > 0) {
+//            outpinexamapplyDto.setDetails(detailsDtoss);
+//            AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
+//            String result6 = getAjaxResult(ajaxResult2);
+//            JSONObject object5 = getJSONObject(result6);
+//            String code4 = object5.getStr("ResultCode");
+//            if (code4.equals("0")) {
+//                List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
+//                for (OutpintestapplyDetailsDto detail : details) {
+//                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+//                    tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
+//                    tree.setPationid(customer.getPationId());
+//                    JSONObject resultData = object5.getJSONObject("ResultData");
+//                    tree.setSqdh(resultData.getStr("jcsqdh"));
+//                    tree.setFyhj(resultData.getStr("fyhj"));
+//                    String mxfyxmbm = detail.getMxfyxmbm();
+//                    tree.setHisXmdm(mxfyxmbm);
+//                    tree.setType("妫�鏌�");
+//                    tree.setService("his");
+//                    tree.setTjPrice(String.valueOf(detail.getProjg()));
+//                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
+//                    if (detail.getSfzhfy().equals("1"))
+//                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
+//                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
+//                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
+//                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
+//                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
+//                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
+//                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
+//                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
+//                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
+//                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
+//                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
+//                        tree.setXmfl(ejjfxmzd.getYjkmdm());
+//                    }
+//                    tree.setCreateTime(DateUtil.date());
+//                    ltkjJianchajianyanTreeService.save(tree);
+//                }
+//            }
+//        }
+//
+//
+//        //闂ㄨ瘖娌荤枟澶勭疆鐢宠
+//        OutpintreatapplyDto dao = new OutpintreatapplyDto();
+//        dao.setHisRegistrationId(cardId);
+//        dao.setSfzh(customer.getCusIdcard());
+//        dao.setSqysbm(ysbm);
+//        dao.setMzksbm(dept);
+//        dao.setSjrq(date);
+//        dao.setCzybm(ysbm);
+//        dao.setCzyksbm(dept);
+//        dao.setSfjz("0");
+////        List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
+//        List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
+//        if (null != detailList && detailList.size() > 0) {
+//            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+//            wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
+//            wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
+//            List<TjProject> projects = projectService.list(wq);
+//            if (null != projects && projects.size() > 0) {
+//                for (TjProject project : projects) {
+//                    if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+//                        if (null != project.getHisXmbm()) {
+//                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+//                            detailsDto.setMxfyxmbm(project.getHisXmbm());
+//                            if (project.getSfzhfy().equals("Y")) {
+//                                detailsDto.setSfzhfy("1");
+//                            } else {
+//                                detailsDto.setSfzhfy("0");
+//                            }
+//                            detailsDto.setSl(project.getSl());
+//                            detailsDto.setProjg(project.getProPrice());
+//                            detailDtos.add(detailsDto);
+//                        }
+//                        if(project.getProId()==1740177341251154377L){
+//                            OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+//                            detilsDto.setYpbm("00006670");
+//                            detilsDto.setPcbm("06");
+//                            detilsDto.setSl("1");
+//                            detilsDto.setDj("60");
+//                            detilsDto.setDcjl("1");
+//                            detilsDto.setPj("60");
+//                            detilsDto.setJj("60");
+//                            detilsDto.setJldw("");
+//                            detilsDto.setTjbm("");
+//                            detilsDto.setPs("");
+//                            detilsDto.setPsbm("");
+//                            detilsDto.setYyts("");
+//                            detilsDto.setXtph("");
+//                            detilsDto.setScph("");
+//                            detilsDto.setYpxq("");
+//                            detilsDto.setCdbm("");
+//                            detilsDto.setKfdw("");
+//                            detilsDto.setYfdw("");
+//                            detilsDto.setYysm("");
+//                            detilsDto.setFzbl("1");
+//                            detilsDto.setZh("0");
+//                            outpinmedicapplyDetilsDtos.add(detilsDto);
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        if (detailDtos.size() > 0) {
+//            dao.setDetails(detailDtos);
+//            AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
+//            String mzylyzsq2 = getAjaxResult(mzylyzsq1);
+//            JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
+//            String code5 = mzylyzsq3.getStr("ResultCode");
+//            if (code5.equals("0")) {
+//                List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
+//                for (OutpintestapplyDetailsDto detail : details1) {
+//                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+//                    tree.setCardId(dao.getHisRegistrationId());
+//                    tree.setPationid(customer.getPationId());
+//                    JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
+//                    tree.setSqdh(resultData.getStr("zlczh"));
+//                    tree.setFyhj(resultData.getStr("fyhj"));
+//                    String mxfyxmbm = detail.getMxfyxmbm();
+//                    tree.setHisXmdm(mxfyxmbm);
+//                    tree.setType("澶勭疆");
+//                    tree.setTjPrice(String.valueOf(detail.getProjg()));
+//                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
+//                    if (detail.getSfzhfy().equals("1"))
+//                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
+//                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
+//                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
+//                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
+//                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
+//                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
+//                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
+//                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
+//                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
+//                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
+//                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
+//                        tree.setXmfl(ejjfxmzd.getYjkmdm());
+//                    }
+//                    tree.setCreateTime(DateUtil.date());
+//                    ltkjJianchajianyanTreeService.save(tree);
+//                }
+//            }
+//        }
+//
+//        //鑽搧鐢宠
+//        if(outpinmedicapplyDetilsDtos.size()>0){
+//            OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
+//            dto1.setHisRegistrationId(cardId);
+//            dto1.setSfzh(customer.getCusIdcard());
+//            dto1.setSqysbm(ysbm);
+//            dto1.setMzksbm(dept);
+//            dto1.setSjrq(date);
+//            dto1.setCzybm(ysbm);
+//            dto1.setCzyksbm(dept);
+//            dto1.setCflxbm("A");
+//            dto1.setYfbm("1");
+//            dto1.setFyts("1");
+//            dto1.setMzzd("");
+//            dto1.setDetails(outpinmedicapplyDetilsDtos);
+//            AjaxResult result = controller.Outpinmedicapply(dto1);
+//            String result1 = getAjaxResult(result);
+//            JSONObject object = getJSONObject(result1);
+//            String code = object.getStr("ResultCode");
+//            if(null !=code && code.equals("0")){
+//                JSONObject resultData = object.getJSONObject("ResultData");
+////                Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
+//                String cfh = resultData.getStr("cfh");
+//                log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+"  outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString());
+//                for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+//                    TjCf cf=new TjCf();
+//                    cf.setCardId(cardId);
+//                    cf.setSfzh(customer.getCusIdcard());
+//                    cf.setCfh(cfh);
+//                    cf.setSqysbm(ysbm);
+//                    cf.setSqysxm(ysmc);
+//                    cf.setMzksbn(dept);
+//                    cf.setSqrq(date);
+//                    cf.setCzybm(ysbm);
+//                    cf.setYpbm(detilsDto.getYpbm());
+//                    cf.setYpmc("灏跨礌[14C]鍛兼皵璇曢獙鑽洅");
+//                    cf.setSl(String.valueOf(detilsDto.getSl()));
+//                    cf.setDj(String.valueOf(detilsDto.getDj()));
+//                    cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+//                    cf.setPj(String.valueOf(detilsDto.getPj()));
+//                    cf.setJj(String.valueOf(detilsDto.getJj()));
+//                    cf.setCreateTime(new Date());
+//                    cfService.save(cf);
+//                }
+//            }
+//        }
+//
+//        return AjaxResult.success();
+//    }
+
     public AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
         String dept = configService.selectConfigByKey("request_default_dept");
         String ysbm = configService.selectConfigByKey("request_default_ysbm");
@@ -199,17 +581,6 @@
         List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
 
         //妫�楠岀敵璇�
-        OutpintestapplyDto dto = new OutpintestapplyDto();
-        dto.setHisRegistrationId(cardId);
-        dto.setSfzh(customer.getCusIdcard());
-        dto.setSqysbm(ysbm);
-        dto.setMzksbm(dept);
-        dto.setSjrq(date);
-        dto.setCzybm(ysbm);
-        dto.setCzyksbm(dept);
-        dto.setSfjz("0");
-
-        List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
         List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
         if (null != detailList && !detailList.isEmpty()) {
             LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
@@ -219,108 +590,119 @@
             wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
             List<TjProject> projects = projectService.list(wq);
             if (null != projects && !projects.isEmpty()) {
-                for (TjProject project : projects) {
-                    if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
-                        if (null != project.getHisXmbm()) {
-                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-                            detailsDto.setMxfyxmbm(project.getHisXmbm());
-                            if (project.getSfzhfy().equals("Y")) {
-                                detailsDto.setSfzhfy("1");
-                            } else {
-                                detailsDto.setSfzhfy("0");
+                List<TjProject> notNull = projects.stream().filter(i -> i.getSpecimenType() != null).collect(Collectors.toList());
+                List<TjProject> isNull = projects.stream().filter(i -> i.getSpecimenType() == null).collect(Collectors.toList());
+                Map<String, List<TjProject>> listMap = notNull.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
+                if (!isNull.isEmpty())
+                    listMap.put("",isNull);
+                for (Map.Entry<String, List<TjProject>> entry : listMap.entrySet()) {
+                    OutpintestapplyDto dto = new OutpintestapplyDto();
+                    dto.setHisRegistrationId(cardId);
+                    dto.setSfzh(customer.getCusIdcard());
+                    dto.setSqysbm(ysbm);
+                    dto.setMzksbm(dept);
+                    dto.setSjrq(date);
+                    dto.setCzybm(ysbm);
+                    dto.setCzyksbm(dept);
+                    dto.setSfjz("0");
+                    List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
+                    List<TjProject> value = entry.getValue();
+                    for (TjProject project : value) {
+                        LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+                        wrapper.eq(TjProject::getProParentId,project.getProId());
+                        List<TjProject> list = projectService.list(wrapper);
+                        for (TjProject tjProject : list) {
+                            if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+                                OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+                                detailsDto.setMxfyxmbm(tjProject.getHisXmbm());
+                                if (tjProject.getSfzhfy().equals("Y")) {
+                                    detailsDto.setSfzhfy("1");
+                                } else {
+                                    detailsDto.setSfzhfy("0");
+                                }
+                                detailsDto.setSl(tjProject.getSl());
+                                detailsDto.setProjg(tjProject.getProPrice());
+                                detailsDtos.add(detailsDto);
                             }
-                            detailsDto.setSl(project.getSl());
-                            detailsDto.setProjg(project.getProPrice());
-                            detailsDtos.add(detailsDto);
-                        }
-                        if(project.getProId()==1740177341251154377L){
-                            OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
-                            detilsDto.setYpbm("00006670");
-                            detilsDto.setPcbm("06");
-                            detilsDto.setSl("1");
-                            detilsDto.setDj("60");
-                            detilsDto.setDcjl("1");
-                            detilsDto.setPj("60");
-                            detilsDto.setJj("60");
-                            detilsDto.setJldw("");
-                            detilsDto.setTjbm("");
-                            detilsDto.setPs("");
-                            detilsDto.setPsbm("");
-                            detilsDto.setYyts("");
-                            detilsDto.setXtph("");
-                            detilsDto.setScph("");
-                            detilsDto.setYpxq("");
-                            detilsDto.setCdbm("");
-                            detilsDto.setKfdw("");
-                            detilsDto.setYfdw("");
-                            detilsDto.setYysm("");
-                            detilsDto.setFzbl("1");
-                            detilsDto.setZh("0");
-                            outpinmedicapplyDetilsDtos.add(detilsDto);
+                            if(project.getProId()==1740177341251154377L){
+                                OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
+                                detilsDto.setYpbm("00006670");
+                                detilsDto.setPcbm("06");
+                                detilsDto.setSl("1");
+                                detilsDto.setDj("60");
+                                detilsDto.setDcjl("1");
+                                detilsDto.setPj("60");
+                                detilsDto.setJj("60");
+                                detilsDto.setJldw("");
+                                detilsDto.setTjbm("");
+                                detilsDto.setPs("");
+                                detilsDto.setPsbm("");
+                                detilsDto.setYyts("");
+                                detilsDto.setXtph("");
+                                detilsDto.setScph("");
+                                detilsDto.setYpxq("");
+                                detilsDto.setCdbm("");
+                                detilsDto.setKfdw("");
+                                detilsDto.setYfdw("");
+                                detilsDto.setYysm("");
+                                detilsDto.setFzbl("1");
+                                detilsDto.setZh("0");
+                                outpinmedicapplyDetilsDtos.add(detilsDto);
+                            }
                         }
                     }
-                }
-            }
-        }
-        if (!detailsDtos.isEmpty()) {
-            dto.setDetails(detailsDtos);
-            AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
-            String result5 = getAjaxResult(ajaxResult1);
-            JSONObject object3 = getJSONObject(result5);
-            String code3 = object3.getStr("ResultCode");
-            if (code3.equals("0")) {
-                List<OutpintestapplyDetailsDto> details = dto.getDetails();
-                for (OutpintestapplyDetailsDto detail : details) {
-                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
-                    tree.setCardId(dto.getHisRegistrationId());
-                    tree.setPationid(customer.getPationId());
-                    JSONObject resultData = object3.getJSONObject("ResultData");
-                    tree.setSqdh(resultData.getStr("jysqdh"));
-                    tree.setFyhj(resultData.getStr("fyhj"));
-                    String mxfyxmbm = detail.getMxfyxmbm();
-                    tree.setHisXmdm(mxfyxmbm);
-                    tree.setType("妫�楠�");
-                    tree.setService("his");
-                    tree.setTjPrice(String.valueOf(detail.getProjg()));
-                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
-                    if (detail.getSfzhfy().equals("1"))
-                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
-                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
-                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
-                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
-                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
-                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
-                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
-                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
-                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
-                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
-                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
-                        tree.setXmfl(ejjfxmzd.getYjkmdm());
-                    }
-                    tree.setCreateTime(DateUtil.date());
-                    ltkjJianchajianyanTreeService.save(tree);
-                }
-                // TODO 涓汉浠ュ強鍥綋 鏆備笉鍚戦噰鏍风鐞嗗啓鏁版嵁
-                // HIS鍙戦�佹棤娉曞悎骞舵搷浣� 鏃犳硶鑾峰彇LIS鐨勬楠屽簭鍙� 鏉$爜鏃犳硶鎵撳嵃
+                    if (!detailsDtos.isEmpty()) {
+                        dto.setDetails(detailsDtos);
+                        AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
+                        String result5 = getAjaxResult(ajaxResult1);
+                        JSONObject object3 = getJSONObject(result5);
+                        String code3 = object3.getStr("ResultCode");
+                        if (code3.equals("0")) {
+                            List<OutpintestapplyDetailsDto> details = dto.getDetails();
+                            for (OutpintestapplyDetailsDto detail : details) {
+                                LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+                                tree.setCardId(dto.getHisRegistrationId());
+                                tree.setPationid(customer.getPationId());
+                                JSONObject resultData = object3.getJSONObject("ResultData");
+                                tree.setSqdh(resultData.getStr("jysqdh"));
+                                tree.setFyhj(resultData.getStr("fyhj"));
+                                String mxfyxmbm = detail.getMxfyxmbm();
+                                tree.setHisXmdm(mxfyxmbm);
+                                tree.setType("妫�楠�");
+                                tree.setService("his");
+                                tree.setTjPrice(String.valueOf(detail.getProjg()));
+                                LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
+                                if (detail.getSfzhfy().equals("1"))
+                                    wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
+                                else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
+                                List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
+                                if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
+                                    String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
+                                    LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
+                                    wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
+                                    LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
+                                    LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
+                                    wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
+                                    LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
+                                    tree.setXmfl(ejjfxmzd.getYjkmdm());
+                                }
+                                tree.setCreateTime(DateUtil.date());
+                                ltkjJianchajianyanTreeService.save(tree);
+                            }
+                            // TODO 涓汉浠ュ強鍥綋 鏆備笉鍚戦噰鏍风鐞嗗啓鏁版嵁
+                            // HIS鍙戦�佹棤娉曞悎骞舵搷浣� 鏃犳硶鑾峰彇LIS鐨勬楠屽簭鍙� 鏉$爜鏃犳硶鎵撳嵃
 //                TjOrder tjOrder = orderService.getOrderByCardId(cardId);
 //                if(null !=tjOrder){
 //                    List<TjOrderDetail> dengJi = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
 //                    tjSysAsyncService.addCaiYangDengJi(dengJi,!dengJi.isEmpty(),tjOrder, SecurityUtils.getLoginUser().getUser(), null);
 //                }
+                        }
+                    }
+                }
             }
         }
 
         //闂ㄨ瘖妫�鏌ョ敵璇�
-        OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
-        outpinexamapplyDto.setHisRegistrationId(cardId);
-        outpinexamapplyDto.setSfzh(customer.getCusIdcard());
-        outpinexamapplyDto.setSqysbm(ysbm);
-        outpinexamapplyDto.setMzksbm(dept);
-        outpinexamapplyDto.setCzybm(ysbm);
-        outpinexamapplyDto.setCzyksbm(dept);
-        outpinexamapplyDto.setSfjz("0");
-//        List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
-        List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
         if (null != detailList && !detailList.isEmpty()) {
             LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
             wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
@@ -328,18 +710,32 @@
             List<TjProject> projects = projectService.list(wq);
             if (null != projects && !projects.isEmpty()) {
                 for (TjProject project : projects) {
+                    OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
+                    outpinexamapplyDto.setHisRegistrationId(cardId);
+                    outpinexamapplyDto.setSfzh(customer.getCusIdcard());
+                    outpinexamapplyDto.setSqysbm(ysbm);
+                    outpinexamapplyDto.setMzksbm(dept);
+                    outpinexamapplyDto.setCzybm(ysbm);
+                    outpinexamapplyDto.setCzyksbm(dept);
+                    outpinexamapplyDto.setSfjz("0");
+                    List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
                     if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
-                        if (null != project.getHisXmbm()) {
-                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-                            detailsDto.setMxfyxmbm(project.getHisXmbm());
-                            if (project.getSfzhfy().equals("Y")) {
-                                detailsDto.setSfzhfy("1");
-                            } else {
-                                detailsDto.setSfzhfy("0");
+                        LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+                        wrapper.eq(TjProject::getProParentId,project.getProId());
+                        List<TjProject> list = projectService.list(wrapper);
+                        for (TjProject tjProject : list) {
+                            if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+                                OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+                                detailsDto.setMxfyxmbm(tjProject.getHisXmbm());
+                                if (tjProject.getSfzhfy().equals("Y")) {
+                                    detailsDto.setSfzhfy("1");
+                                } else {
+                                    detailsDto.setSfzhfy("0");
+                                }
+                                detailsDto.setSl(tjProject.getSl());
+                                detailsDto.setProjg(tjProject.getProPrice());
+                                detailsDtoss.add(detailsDto);
                             }
-                            detailsDto.setSl(project.getSl());
-                            detailsDto.setProjg(project.getProPrice());
-                            detailsDtoss.add(detailsDto);
                         }
                         if(project.getProId()==1740177341251154377L){
                             OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
@@ -367,46 +763,46 @@
                             outpinmedicapplyDetilsDtos.add(detilsDto);
                         }
                     }
-                }
-            }
-        }
-        if (detailsDtoss.size() > 0) {
-            outpinexamapplyDto.setDetails(detailsDtoss);
-            AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
-            String result6 = getAjaxResult(ajaxResult2);
-            JSONObject object5 = getJSONObject(result6);
-            String code4 = object5.getStr("ResultCode");
-            if (code4.equals("0")) {
-                List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
-                for (OutpintestapplyDetailsDto detail : details) {
-                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
-                    tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
-                    tree.setPationid(customer.getPationId());
-                    JSONObject resultData = object5.getJSONObject("ResultData");
-                    tree.setSqdh(resultData.getStr("jcsqdh"));
-                    tree.setFyhj(resultData.getStr("fyhj"));
-                    String mxfyxmbm = detail.getMxfyxmbm();
-                    tree.setHisXmdm(mxfyxmbm);
-                    tree.setType("妫�鏌�");
-                    tree.setService("his");
-                    tree.setTjPrice(String.valueOf(detail.getProjg()));
-                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
-                    if (detail.getSfzhfy().equals("1"))
-                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
-                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
-                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
-                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
-                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
-                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
-                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
-                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
-                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
-                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
-                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
-                        tree.setXmfl(ejjfxmzd.getYjkmdm());
+                    if (detailsDtoss.size() > 0) {
+                        outpinexamapplyDto.setDetails(detailsDtoss);
+                        AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
+                        String result6 = getAjaxResult(ajaxResult2);
+                        JSONObject object5 = getJSONObject(result6);
+                        String code4 = object5.getStr("ResultCode");
+                        if (code4.equals("0")) {
+                            List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
+                            for (OutpintestapplyDetailsDto detail : details) {
+                                LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+                                tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
+                                tree.setPationid(customer.getPationId());
+                                JSONObject resultData = object5.getJSONObject("ResultData");
+                                tree.setSqdh(resultData.getStr("jcsqdh"));
+                                tree.setFyhj(resultData.getStr("fyhj"));
+                                String mxfyxmbm = detail.getMxfyxmbm();
+                                tree.setHisXmdm(mxfyxmbm);
+                                tree.setType("妫�鏌�");
+                                tree.setService("his");
+                                tree.setTjPrice(String.valueOf(detail.getProjg()));
+                                LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
+                                if (detail.getSfzhfy().equals("1"))
+                                    wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
+                                else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
+                                List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
+                                if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
+                                    String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
+                                    LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
+                                    wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
+                                    LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
+                                    LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
+                                    wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
+                                    LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
+                                    tree.setXmfl(ejjfxmzd.getYjkmdm());
+                                }
+                                tree.setCreateTime(DateUtil.date());
+                                ltkjJianchajianyanTreeService.save(tree);
+                            }
+                        }
                     }
-                    tree.setCreateTime(DateUtil.date());
-                    ltkjJianchajianyanTreeService.save(tree);
                 }
             }
         }
@@ -423,7 +819,6 @@
         dao.setCzyksbm(dept);
         dao.setSfjz("0");
 //        List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
-        List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
         if (null != detailList && detailList.size() > 0) {
             LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
             wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
@@ -431,18 +826,24 @@
             List<TjProject> projects = projectService.list(wq);
             if (null != projects && projects.size() > 0) {
                 for (TjProject project : projects) {
+                    List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
                     if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
-                        if (null != project.getHisXmbm()) {
-                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-                            detailsDto.setMxfyxmbm(project.getHisXmbm());
-                            if (project.getSfzhfy().equals("Y")) {
-                                detailsDto.setSfzhfy("1");
-                            } else {
-                                detailsDto.setSfzhfy("0");
+                        LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+                        wrapper.eq(TjProject::getProParentId,project.getProId());
+                        List<TjProject> list = projectService.list(wrapper);
+                        for (TjProject tjProject : list) {
+                            if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
+                                OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+                                detailsDto.setMxfyxmbm(tjProject.getHisXmbm());
+                                if (tjProject.getSfzhfy().equals("Y")) {
+                                    detailsDto.setSfzhfy("1");
+                                } else {
+                                    detailsDto.setSfzhfy("0");
+                                }
+                                detailsDto.setSl(tjProject.getSl());
+                                detailsDto.setProjg(tjProject.getProPrice());
+                                detailDtos.add(detailsDto);
                             }
-                            detailsDto.setSl(project.getSl());
-                            detailsDto.setProjg(project.getProPrice());
-                            detailDtos.add(detailsDto);
                         }
                         if(project.getProId()==1740177341251154377L){
                             OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
@@ -470,45 +871,45 @@
                             outpinmedicapplyDetilsDtos.add(detilsDto);
                         }
                     }
-                }
-            }
-        }
-        if (detailDtos.size() > 0) {
-            dao.setDetails(detailDtos);
-            AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
-            String mzylyzsq2 = getAjaxResult(mzylyzsq1);
-            JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
-            String code5 = mzylyzsq3.getStr("ResultCode");
-            if (code5.equals("0")) {
-                List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
-                for (OutpintestapplyDetailsDto detail : details1) {
-                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
-                    tree.setCardId(dao.getHisRegistrationId());
-                    tree.setPationid(customer.getPationId());
-                    JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
-                    tree.setSqdh(resultData.getStr("zlczh"));
-                    tree.setFyhj(resultData.getStr("fyhj"));
-                    String mxfyxmbm = detail.getMxfyxmbm();
-                    tree.setHisXmdm(mxfyxmbm);
-                    tree.setType("澶勭疆");
-                    tree.setTjPrice(String.valueOf(detail.getProjg()));
-                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
-                    if (detail.getSfzhfy().equals("1"))
-                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
-                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
-                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
-                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
-                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
-                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
-                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
-                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
-                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
-                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
-                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
-                        tree.setXmfl(ejjfxmzd.getYjkmdm());
+                    if (detailDtos.size() > 0) {
+                        dao.setDetails(detailDtos);
+                        AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
+                        String mzylyzsq2 = getAjaxResult(mzylyzsq1);
+                        JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
+                        String code5 = mzylyzsq3.getStr("ResultCode");
+                        if (code5.equals("0")) {
+                            List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
+                            for (OutpintestapplyDetailsDto detail : details1) {
+                                LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
+                                tree.setCardId(dao.getHisRegistrationId());
+                                tree.setPationid(customer.getPationId());
+                                JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
+                                tree.setSqdh(resultData.getStr("zlczh"));
+                                tree.setFyhj(resultData.getStr("fyhj"));
+                                String mxfyxmbm = detail.getMxfyxmbm();
+                                tree.setHisXmdm(mxfyxmbm);
+                                tree.setType("澶勭疆");
+                                tree.setTjPrice(String.valueOf(detail.getProjg()));
+                                LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
+                                if (detail.getSfzhfy().equals("1"))
+                                    wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
+                                else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
+                                List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
+                                if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
+                                    String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
+                                    LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
+                                    wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
+                                    LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
+                                    LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
+                                    wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
+                                    LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
+                                    tree.setXmfl(ejjfxmzd.getYjkmdm());
+                                }
+                                tree.setCreateTime(DateUtil.date());
+                                ltkjJianchajianyanTreeService.save(tree);
+                            }
+                        }
                     }
-                    tree.setCreateTime(DateUtil.date());
-                    ltkjJianchajianyanTreeService.save(tree);
                 }
             }
         }
@@ -1146,4 +1547,78 @@
 
     }
 
+    public void Getlabreginfoinfo(String hisCardId,String orderTime){
+        AjaxResult ajaxResult = controller.Getlabreginfoinfo(hisCardId,true,orderTime);
+        saveLabRegInfo(ajaxResult);
+        ajaxResult = controller.Getlabreginfoinfo(hisCardId,false,orderTime);
+        saveLabRegInfo(ajaxResult);
+    }
+
+    private void saveLabRegInfo(AjaxResult ajaxResult) {
+        if (ajaxResult.get("code").toString().equals("200")){
+            JSONObject data = JSONUtil.parseObj(ajaxResult.get("data").toString());
+            JSONObject response = data.getJSONObject("Response");
+            if (response.getStr("ResultCode").equals("0")) {
+                JSONArray array = response.getJSONArray("ResultData");
+                if (!array.isEmpty()){
+                    for (Object o : array) {
+                        JSONObject jsonObject = (JSONObject) o;
+                        TbLisSq tbLisSq = new TbLisSq();
+                        tbLisSq.setGrbslx(trimString(jsonObject.getStr("GRBSLX")));
+                        tbLisSq.setZdjgdm(trimString(jsonObject.getStr("ZDJGDM")));
+                        tbLisSq.setMzzybz(trimString(jsonObject.getStr("MZZYBZ")));
+                        tbLisSq.setZdjgmc(trimString(jsonObject.getStr("ZDJGMC")));
+                        tbLisSq.setBgysqm(trimString(jsonObject.getStr("BGYSQM")));
+                        tbLisSq.setShysqm(trimString(jsonObject.getStr("SHYSQM")));
+                        tbLisSq.setSqrqsj(trimString(jsonObject.getStr("SQRQSJ")));
+                        tbLisSq.setSqjgmc(trimString(jsonObject.getStr("SQJGMC")));
+                        tbLisSq.setSqrbh(trimString(jsonObject.getStr("SQRBH")));
+                        tbLisSq.setXyzddm(trimString(jsonObject.getStr("XYZDDM")));
+                        tbLisSq.setJyxmmc(trimString(jsonObject.getStr("JYXMMC")));
+                        tbLisSq.setCardId(trimString(jsonObject.getStr("his_registration_id")));
+                        tbLisSq.setHzlxdm(trimString(jsonObject.getStr("HZLXDM")));
+                        tbLisSq.setBgysbh(trimString(jsonObject.getStr("BGYSBH")));
+                        tbLisSq.setJyxmdm(trimString(jsonObject.getStr("JYXMDM")));
+                        tbLisSq.setBgksbh(trimString(jsonObject.getStr("BGKSBH")));
+                        tbLisSq.setSqdbh(trimString(jsonObject.getStr("SQDBH")));
+                        tbLisSq.setJyxh(trimString(jsonObject.getStr("JYXH")));
+                        tbLisSq.setHzxb(trimString(jsonObject.getStr("HZXB")));
+                        tbLisSq.setSqjgdm(trimString(jsonObject.getStr("SQJGDM")));
+                        tbLisSq.setSqrxm(trimString(jsonObject.getStr("SQRXM")));
+                        tbLisSq.setBgjgdm(trimString(jsonObject.getStr("BGJGDM")));
+                        tbLisSq.setJyxhHb(trimString(jsonObject.getStr("jyxh_hb")));
+                        tbLisSq.setHzksmc(trimString(jsonObject.getStr("HZKSMC")));
+                        tbLisSq.setHzxm(trimString(jsonObject.getStr("HZXM")));
+                        tbLisSq.setSqksmc(trimString(jsonObject.getStr("SQKSMC")));
+                        tbLisSq.setYljgdm(trimString(jsonObject.getStr("YLJGDM")));
+                        tbLisSq.setPationId(trimString(jsonObject.getStr("PationId")));
+                        tbLisSq.setBgksmc(trimString(jsonObject.getStr("BGKSMC")));
+                        tbLisSq.setDhhm(trimString(jsonObject.getStr("DHHM")));
+                        tbLisSq.setHzzs(trimString(jsonObject.getStr("HZZS")));
+                        tbLisSq.setJyrq(trimString(jsonObject.getStr("JYRQ")));
+                        tbLisSq.setZzksrqsj(trimString(jsonObject.getStr("ZZKSRQSJ")));
+                        tbLisSq.setHznl(trimString(jsonObject.getStr("HZNL")));
+                        tbLisSq.setShrq(trimString(jsonObject.getStr("SHRQ")));
+                        tbLisSq.setBgjgmc(trimString(jsonObject.getStr("BGJGMC")));
+                        tbLisSq.setSqksdm(trimString(jsonObject.getStr("SQKSDM")));
+                        tbLisSq.setHzksdm(trimString(jsonObject.getStr("HZKSDM")));
+                        tbLisSq.setShysbh(trimString(jsonObject.getStr("SHYSBH")));
+                        tbLisSq.setXyzdmc(trimString(jsonObject.getStr("XYZDMC")));
+                        tbLisSq.setZfbz(trimString(jsonObject.getStr("zfbz")));
+                        LambdaQueryWrapper<TbLisSq> wrapper = new LambdaQueryWrapper<>(tbLisSq);
+                        List<TbLisSq> list = tbLisSqService.list(wrapper);
+                        if (list.isEmpty()){
+                            tbLisSq.setId(IdUtil.getSnowflake().nextId());
+                            tbLisSqService.save(tbLisSq);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private String trimString(String value) {
+        return value != null ? value.trim() : null;
+    }
+
 }

--
Gitblit v1.8.0