zjh 2024/07/5-1

zjh

2024-07-05 ab550ebbfa4b579b373fdd7589e799bbb44362e7

zjh 2024/07/5-1

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java

@@ -1,37 +1,53 @@
//package com.ltkj.web.controller.his;
//
//
//import com.ltkj.common.core.controller.BaseController;
//import com.ltkj.common.core.domain.AjaxResult;
//import com.ltkj.common.core.page.TableDataInfo;
//import com.ltkj.common.utils.http.HttpUtils;
//import com.ltkj.hosp.domain.DictSsdm;
//import com.ltkj.hosp.domain.TjCustomer;
//import com.ltkj.hosp.hisDto.*;
//import com.ltkj.hosp.service.ITjCustomerService;
//import com.ltkj.web.wxUtils.HttpClientUtils;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import io.swagger.annotations.ApiParam;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.*;
//
//import javax.annotation.Resource;
//import java.util.Date;
//import java.util.HashMap;
//import java.util.List;
//import java.util.Map;
//
//
//@Api(tags = "AAAAA-----HISAPI相关接口文档")
//@RestController
//@RequestMapping("/api/His")
//public class HisApiController extends BaseController {
package com.ltkj.web.controller.his;


import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.page.TableDataInfo;
import com.ltkj.common.utils.http.HttpUtils;
import com.ltkj.hosp.domain.DictSsdm;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.web.wxUtils.HttpClientUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


@Api(tags = "AAAAA-----HISAPI相关接口文档")
@RestController
@RequestMapping("/api/His")
public class HisApiController extends BaseController {
//    @Autowired
//    private ITjCustomerService tjCustomerService;
//
//    @Autowired
//    private HisApiGetMethodService service;
//
//    private static final String HIS_URL = "https://mock.mengxuegu.com/mock/664d3dbce45d2156fa209c80/example/api/His/HisRequest";
//
//
//    @GetMapping("/his")
//    public AjaxResult Outpinconapply() {
//        Map<String, Object> maps = new HashMap<>();
//        maps.put("his_registration_id","20240704000218");
//        maps.put("ksbm", "体检中心");
//        maps.put("pagecount", 100);
//        maps.put("page", 1);
//       service.getHISDataNew("", maps);
//        return AjaxResult.success();
//    }


//    @PostMapping("/Outpincreateapply")
//    @ApiOperation(value = "新增/修改门诊注册信息")
//    public AjaxResult Outpincreateapply(@RequestBody TjCustomer customer) {
@@ -716,4 +732,4 @@
//        String post = HttpClientUtils.sendPost(HIS_URL, map);
//        return AjaxResult.success(post);
//    }
//}
}

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java

@@ -68,7 +68,7 @@
            DATA_PASS = props.getProperty("password");
            String apiUrl = props.getProperty("his_api_url");
            String apiPort = props.getProperty("his_api_port");
            HIS_URL = apiUrl+":"+apiPort+"/api/His/HisRequest";
            HIS_URL = apiUrl+":"+apiPort;
        } catch (IOException e) {
            System.out.println("初始化数据库异常 ->"+e.getMessage());
        }

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -122,7 +122,8 @@
    private LtkjEjjfxmzdService ltkjEjjfxmzdService;
    @Autowired
    private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;

    @Autowired
    private TjProBlService blService;
    @Override
    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        long l = System.currentTimeMillis();
@@ -497,6 +498,18 @@
    public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
        Date dates = new Date();
        final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");

        String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss")+order.getOrderId();

        TjProBl proBl=new TjProBl();
        proBl.setTjh(order.getTjNumber());
        proBl.setBldh(jxbz);
        proBl.setBlsj(date);
        proBl.setBlrdm(sysUser.getUserName());
        proBl.setBlrmc(sysUser.getNickName());
        proBl.setBlje(String.valueOf(tjFlowingWater.getPaidIn()));
        blService.save(proBl);

        List<TjConsumables> list2 = new ArrayList<>();
        String[] tjProIds = tjFlowingWater.getTjProIds();

@@ -531,6 +544,7 @@
                tjOrderRemark.setUpdateTime(dates);
                tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
                tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
                tjOrderRemark.setJxbz(jxbz);
                orderRemarkService.save(tjOrderRemark);

                List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
@@ -546,6 +560,7 @@
                detail.setUpdateTime(dates);
                detail.setCreateId(String.valueOf(sysUser.getUserId()));
                detail.setUpdateId(String.valueOf(sysUser.getUserId()));
                detail.setJxbz(jxbz);
                tjOrderDetailService.save(detail);
                for (Long proId : proIds) {
                    TjOrderDetail detail1 = new TjOrderDetail();
@@ -554,12 +569,13 @@
//                    detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
                    detail1.setProId(proId);
                    detail1.setIsAddition("Y");
                    detail.setCreateBy(sysUser.getNickName());
                    detail.setCreateTime(dates);
                    detail.setUpdateBy(sysUser.getNickName());
                    detail.setUpdateTime(dates);
                    detail.setCreateId(String.valueOf(sysUser.getUserId()));
                    detail.setUpdateId(String.valueOf(sysUser.getUserId()));
                    detail1.setCreateBy(sysUser.getNickName());
                    detail1.setCreateTime(dates);
                    detail1.setUpdateBy(sysUser.getNickName());
                    detail1.setUpdateTime(dates);
                    detail1.setCreateId(String.valueOf(sysUser.getUserId()));
                    detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
                    detail1.setJxbz(jxbz);
                    tjOrderDetailService.save(detail1);
                }
                wqq.in(TbTransition::getProId, proIds);
@@ -643,6 +659,7 @@
                detail.setUpdateTime(dates);
                detail.setCreateId(String.valueOf(sysUser.getUserId()));
                detail.setUpdateId(String.valueOf(sysUser.getUserId()));
                detail.setJxbz(jxbz);
                tjOrderDetailService.save(detail);

            }
@@ -650,56 +667,58 @@
            List<TbTransition> tbTransitionList = transitionService.list(wqq);
            if (null != tbTransitionList && tbTransitionList.size() > 0) {
                for (TbTransition transition : tbTransitionList) {
                    transition.setJxbz(jxbz);
                    transition.setTjNum(order.getTjNumber());
                    transition.setCardId(order.getCardId());
                    transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
                    transitionService.updateById(transition);
                    TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
//                    TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
                    //子项
                    if (null != tjProject) {
                        TjChargingStandard tjChargingStandard = new TjChargingStandard();
                        tjChargingStandard.setTjNum(order.getTjNumber());
                        tjChargingStandard.setProId(transition.getProId());
                        tjChargingStandard.setPrice(transition.getNowPrice());
                        tjChargingStandard.setProName(tjProject.getProName());
                        tjChargingStandard.setCreateBy(sysUser.getNickName());
                        tjChargingStandard.setCreateTime(dates);
                        tjChargingStandard.setUpdateBy(sysUser.getNickName());
                        tjChargingStandard.setUpdateTime(dates);
                        tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
                        tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
                        chargingStandardService.save(tjChargingStandard);
                    }
//                    if (null != tjProject) {
//                        TjChargingStandard tjChargingStandard = new TjChargingStandard();
//                        tjChargingStandard.setTjNum(order.getTjNumber());
//                        tjChargingStandard.setProId(transition.getProId());
//                        tjChargingStandard.setPrice(transition.getNowPrice());
//                        tjChargingStandard.setProName(tjProject.getProName());
//                        tjChargingStandard.setCreateBy(sysUser.getNickName());
//                        tjChargingStandard.setCreateTime(dates);
//                        tjChargingStandard.setUpdateBy(sysUser.getNickName());
//                        tjChargingStandard.setUpdateTime(dates);
//                        tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
//                        tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
//                        chargingStandardService.save(tjChargingStandard);
//                    }
                }
                //父项

                TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
                if (null != parentProject && parentProject.getProParentId() == 0) {
                    LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
                    wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
                    List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
                    if (null != proConsumables && proConsumables.size() > 0) {
                        for (TjProConsumables tjProConsumables : proConsumables) {
                            TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
                            list2.add(tjConsumables);
                        }
//
//                TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
//                if (null != parentProject && parentProject.getProParentId() == 0) {
//                    LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
//                    wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
//                    List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
//                    if (null != proConsumables && proConsumables.size() > 0) {
//                        for (TjProConsumables tjProConsumables : proConsumables) {
//                            TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
//                            list2.add(tjConsumables);
//                        }
//                    }
//
//                } else {
//                    TjProject parentProjects = projectService.getById(tjProId);
//                    if (null != parentProjects) {
//                        LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
//                        wqqq.eq(TjProConsumables::getProId, parentProjects.getProId());
//                        List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
//                        if (null != proConsumables && proConsumables.size() > 0) {
//                            for (TjProConsumables tjProConsumables : proConsumables) {
//                                TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
//                                list2.add(tjConsumables);
//                            }
//                        }
//                    }
//                }
                    }

                } else {
                    TjProject parentProjects = projectService.getById(tjProId);
                    if (null != parentProjects) {
                        LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
                        wqqq.eq(TjProConsumables::getProId, parentProjects.getProId());
                        List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
                        if (null != proConsumables && proConsumables.size() > 0) {
                            for (TjProConsumables tjProConsumables : proConsumables) {
                                TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
                                list2.add(tjConsumables);
                            }
                        }
                    }
                }
            }
        }

        if(projectList.size()>0){
@@ -716,6 +735,7 @@
                tjOrderRemark.setUpdateTime(dates);
                tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
                tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
                tjOrderRemark.setJxbz(jxbz);
                orderRemarkService.save(tjOrderRemark);

                TjOrderDetail detail1 = new TjOrderDetail();
@@ -730,6 +750,7 @@
                detail1.setUpdateTime(dates);
                detail1.setCreateId(String.valueOf(sysUser.getUserId()));
                detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
                detail1.setJxbz(jxbz);
                tjOrderDetailService.save(detail1);
                if(null !=config && config.equals("Y")){
                    //检验
@@ -813,6 +834,8 @@
                    List<OutpintestapplyDetailsDto> details = dto.getDetails();
                    for (OutpintestapplyDetailsDto detail : details) {
                        LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                        tree.setSfjx("Y");
                        tree.setJxbz(jxbz);
                        tree.setCardId(dto.getHisRegistrationId());
                        LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
                        wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
@@ -872,6 +895,8 @@
                    List<OutpintestapplyDetailsDto> details = outpinexamapplyDto.getDetails();
                    for (OutpintestapplyDetailsDto detail : details) {
                        LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                        tree.setSfjx("Y");
                        tree.setJxbz(jxbz);
                        tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
                        LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
                        wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
@@ -932,6 +957,8 @@
                    List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
                    for (OutpintestapplyDetailsDto detail : details1) {
                        LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                        tree.setSfjx("Y");
                        tree.setJxbz(jxbz);
                        tree.setCardId(dao.getHisRegistrationId());
                        LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
                        wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
@@ -974,23 +1001,23 @@


        //父项耗材
        ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
        for (TjConsumables tjConsumables : collect) {
            TjChargingStandard tjChargingStandard = new TjChargingStandard();
            tjChargingStandard.setTjNum(order.getTjNumber());
            tjChargingStandard.setConsumablesId(tjConsumables.getId());
            tjChargingStandard.setPrice(tjConsumables.getPrice());
            tjChargingStandard.setProName(tjConsumables.getMakings());
            tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
            tjChargingStandard.setCompany(tjConsumables.getSpecifications());
            tjChargingStandard.setCreateBy(sysUser.getNickName());
            tjChargingStandard.setCreateTime(dates);
            tjChargingStandard.setUpdateBy(sysUser.getNickName());
            tjChargingStandard.setUpdateTime(dates);
            tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
            tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
            chargingStandardService.save(tjChargingStandard);
        }
//        ArrayList<TjConsumables> collect = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
//        for (TjConsumables tjConsumables : collect) {
//            TjChargingStandard tjChargingStandard = new TjChargingStandard();
//            tjChargingStandard.setTjNum(order.getTjNumber());
//            tjChargingStandard.setConsumablesId(tjConsumables.getId());
//            tjChargingStandard.setPrice(tjConsumables.getPrice());
//            tjChargingStandard.setProName(tjConsumables.getMakings());
//            tjChargingStandard.setConsumablesName(tjConsumables.getMakings());
//            tjChargingStandard.setCompany(tjConsumables.getSpecifications());
//            tjChargingStandard.setCreateBy(sysUser.getNickName());
//            tjChargingStandard.setCreateTime(dates);
//            tjChargingStandard.setUpdateBy(sysUser.getNickName());
//            tjChargingStandard.setUpdateTime(dates);
//            tjChargingStandard.setCreateId(String.valueOf(sysUser.getUserId()));
//            tjChargingStandard.setUpdateId(String.valueOf(sysUser.getUserId()));
//            chargingStandardService.save(tjChargingStandard);
//        }
    }

    @Override

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

@@ -29,6 +29,7 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -95,16 +96,17 @@
    @Resource
    private LtkjMiddleHeadService headService;
    @Resource
    private LtkjExamJcbgdService ltkjExamJcbgdService;
    private LtkjExamJcbgdService jcbgdService;
    @Resource
    private LtkjExamJcsqdService ltkjExamJcsqdService;
    private LtkjExamJcsqdService jcsqdService;
    @Resource
    private LtkjHybgdService ltkjHybgdService;
    @Resource
    private LtkjHysqdService ltkjHysqdService;
    @Autowired
    private HisApiMethodService controller;

    @Autowired
    private HisApiGetMethodService service;


    @GetMapping("/getOperationPermissionsByTjNum")
@@ -357,15 +359,7 @@

            List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
            if(null !=baoGaoDans && baoGaoDans.size()>0){

//                List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
//                if (one != null && one.size() > 0) {
//                    for (LtkjHysqd ltkjHysqd : one) {
//                        ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
//                        ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
//                    }
//                }
//                for (String baoGaoDan : baoGaoDans) {
                    //同步检验
                    Date dates = new Date();
                    Map<String,Object> map=new HashMap<>();
                    map.put("his_registration_id",order.getCardId());
@@ -383,6 +377,10 @@
                        return AjaxResult.error("化验项目暂时无结果,请稍后同步!!!");
                    }
                    JSONArray data = object.getJSONArray("ResultData");
//                    int size = data.size();
//                    if(size>0){
//
//                     }
                    for (Object datum : data) {
                        JSONObject jsonObject = (JSONObject)datum;
                        LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
@@ -404,6 +402,7 @@
                        hysqd.setSqdh(jsonObject.getStr("SQDBH"));
                        hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
                        hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
                        hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
                        if (ltkjHysqdService.save(hysqd)) {
                            Map<String,Object> hashMap=new HashMap<>();
                            hashMap.put("jybgid",hysqd.getTmh());
@@ -411,9 +410,7 @@
                            String result2 = getAjaxResult(bgdres);
                            JSONObject object1 = getJSONObject(result2);
                            String code1 = object1.getStr("ResultCode");
                            if(null ==code1 || !code1.equals("0")){
                                return AjaxResult.error("化验项目暂时无结果,请稍后同步!!!");
                            }
                            if (null != code1 && code1.equals("0")) {
                            JSONArray datas = object1.getJSONArray("ResultData");
                            for (Object o : datas) {
                                JSONObject js = (JSONObject)o;
@@ -440,15 +437,68 @@
                            }
                        }
                    }
//                }
                    }

                    //同步检查
                    Map<String, Object> maps = new HashMap<>();
                    maps.put("his_registration_id", order.getCardId());
                    maps.put("ksbm", "体检中心");
                    maps.put("pagecount", 100);
                    maps.put("page", 1);
                    AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);
                    if (Integer.parseInt(results.get("code").toString()) == 200) {
                        List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
                        if(null !=datas && datas.size()>0){
                            for (Map<String, Object> objectMap : datas) {
                                LtkjExamJcsqd jybgid = jcsqdService.getLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
                                if (null != jybgid) {
                                    jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId(), objectMap.get("JCBGID").toString());
                                    jcbgdService.deletedLtkjJcbgdByTjhAndTmh(jybgid.getTmh());
                                }
                                LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
                                jcbgd.setTjh(order.getCardId());
                                if(null !=objectMap.get("JCBGID") || !objectMap.get("JCBGID").equals(""))
                                jcbgd.setTmh(objectMap.get("JCBGID").toString());

                                if(null !=objectMap.get("JCXMDM") || !objectMap.get("JCXMDM").equals(""))
                                jcbgd.setXmdm(objectMap.get("JCXMDM").toString());

                                if(null !=objectMap.get("JCXMMC") || !objectMap.get("JCXMMC").equals(""))
                                jcbgd.setXmmc(objectMap.get("JCXMMC").toString());

                                if(null !=objectMap.get("JCXMJG") || !objectMap.get("JCXMJG").equals(""))
                                jcbgd.setBgNr(objectMap.get("JCXMJG").toString());

                                if(null !=objectMap.get("reporturl") || !objectMap.get("reporturl").equals(""))
                                jcbgd.setBgUrl(objectMap.get("reporturl").toString());

                                if(null !=objectMap.get("SHYSQM") || !objectMap.get("SHYSQM").equals(""))
                                jcbgd.setShysxm(objectMap.get("SHYSQM").toString());

                                if(null !=objectMap.get("SHYSBH") || !objectMap.get("SHYSBH").equals(""))
                                jcbgd.setShysdm(objectMap.get("SHYSBH").toString());

                                if(null !=objectMap.get("YXZD") || !objectMap.get("YXZD").equals(""))
                                jcbgd.setYxzd(objectMap.get("YXZD").toString());

                                if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals(""))
                                jcbgd.setYxbx(objectMap.get("YXBX").toString());

                                if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
                                jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());

                                jcbgdService.save(jcbgd);
                            }
                            jcsqdService.saveLtkjExamJcsqd(order.getCardId());
                        }
                    }
                }

                //同步化验项目
                testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                //同步检查项目
                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                asyncService.updateCheckType(order.getTjNumber());
            }


        }
        return AjaxResult.success("同步成功");
        }
@@ -667,7 +717,8 @@
//            List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
//            return AjaxResult.success(cacheMapValue);
//        }
        return getAjaxResult(tjNumber);
//        return getAjaxResult(tjNumber);
        return getResult(tjNumber);
    }

    private AjaxResult getAjaxResult(String tjNumber) {
@@ -778,9 +829,9 @@
        if (one == null) {
            return AjaxResult.error("暂无数据！！");
        }
        final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
        if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
        tbhyxm(one);
//        final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
//        if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
//        tbhyxm(one);
//        TjCustomer customer = customerService.getById(one.getUserId());
        List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanTable(tjNumber);
        List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber);
@@ -852,6 +903,94 @@
    }


    @GetMapping ("/updateHYANDCGCheckType")
    @ApiOperation (value = "总检点击体检信息详情————常规和化验项目")
    public AjaxResult updateHYANDCGCheckType(@ApiParam (value = "客户体检号") @RequestParam String tjNumber) {
        return getResult(tjNumber);
    }

    private AjaxResult getResult(String tjNumber) {
        asyncService.updateCheckType(tjNumber);
        List<Map<String, Object>> list = new ArrayList<>();
        TjOrder one = orderService.getOrderByTjNum(tjNumber);

        if (one == null) {
            return AjaxResult.error("暂无数据！！");
        }
//        final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
//        if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
//        tbhyxm(one);
        TjCustomer customer = customerService.getById(one.getUserId());
        List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanAndCgTable(tjNumber);
        List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);


        if (null != remarkList && remarkList.size() > 0) {
            for (TjOrderRemark remark : remarkList) {
                Map<String, Object> parent = new HashMap<>();
                parent.put("checkAdvice", one.getCheckAdvice());
                parent.put("parent", remark.getProName());
                parent.put("parentId", remark.getProsId().toString());
                List<TjOrderDetail> dels = new ArrayList<>();
                if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                            String ckfw = tjOrderDetail.getStanId();
                            if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
                                ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
                            }
                            if (StrUtil.isNotBlank(ckfw)) {
                                try {
                                    Integer.parseInt(tjOrderDetail.getYcbz());
                                    String[] split = ckfw.split("-");
                                    BigDecimal min = new BigDecimal(split[0]);
                                    BigDecimal max = new BigDecimal(split[1]);
                                    String proResult = tjOrderDetail.getProResult();
                                    BigDecimal jyjgval = new BigDecimal(proResult);
                                    if (jyjgval.compareTo(min) < 0) {
                                        tjOrderDetail.setYcbz("↓");
                                    } else if (jyjgval.compareTo(max) > 0) {
                                        tjOrderDetail.setYcbz("↑");
                                    } else {
                                        tjOrderDetail.setYcbz("");
                                    }
                                } catch (NumberFormatException ignored) {
                                    ignored.printStackTrace();
                                }
                            }
                            if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
                                tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
                            }
                            dels.add(tjOrderDetail);
                        }
                    }
                    String summary = remark.getSummary();
                    if (null != summary) {
                        String[] split = summary.split(";");
                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
                    } else {
                        parent.put("parentAdvice", null);
                    }
                    if (dels.size() == 0) {
                        continue;
                    }
                    parent.put("sons", dels);
                    parent.put("remark", remark.getRemark());
                    if (remark.getDoctorName() != null) {
                        parent.put("doctorName", remark.getDoctorName());
                    }

                    list.add(parent);
                } else {
                    return AjaxResult.success("该客户没有体检项目数据");
                }
            }
            return AjaxResult.success(list);
        }
        return AjaxResult.success("该客户没有体检项目数据！");
    }


    @GetMapping("/getTm")
    @ApiOperation(value = "获取条码")
//    @PreAuthorize("@ss.hasPermi('check:check:getTm')")

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

@@ -46,6 +46,7 @@
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.dto.QianDaoDto;
import com.ltkj.hosp.dto.TjProBlDto;
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
@@ -192,6 +193,10 @@
    private ISysDeptService sysDeptService;
    @Autowired
    private HisApiMethodService controller;
    @Autowired
    private TjProBlService blService;
    @Autowired
    private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;

    /**
     * 查询体检记录列表
@@ -2746,5 +2751,84 @@
        }
        return AjaxResult.success();
    }


    @GetMapping("/getBlproByTjh")
    @ApiOperation(value = "根据体检号获取补录项目记录")
    @Transactional
    public AjaxResult getBlproByTjh(@RequestParam @ApiParam(value = "体检号") String tjNum) {

        TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
        if (null != order) {
            LambdaQueryWrapper<TjProBl> wq=new LambdaQueryWrapper<>();
            wq.eq(TjProBl::getTjh,tjNum);
            List<TjProBl> blList = blService.list(wq);
            if(null !=blList && blList.size()>0){
                for (TjProBl bl : blList) {
                    LambdaQueryWrapper<TjOrderRemark>wqr=new LambdaQueryWrapper<>();
                    wqr.eq(TjOrderRemark::getJxbz,bl.getBldh());
                    List<TjOrderRemark> remarkList = remarkService.list(wqr);
                    if(null !=remarkList && remarkList.size()>0){
                        List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
                        LambdaQueryWrapper<TjProject> wqp=new LambdaQueryWrapper<>();
                        wqp.in(TjProject::getProId,collect);
                        List<TjProject> projectList = projectService.list(wqp);
                        for (TjProject project : projectList) {
                            project.setChildren(projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())));
                        }
                        bl.setProjectList(projectList);
                    }
                }
                return AjaxResult.success(blList);
            }
            return AjaxResult.success(null);
        }
        return AjaxResult.error("暂无体检记录");
    }



    @PostMapping("/revokeBlProByBldhAndTjh")
    @ApiOperation(value = "根据补录单号和体检号删除记录")
    @Transactional
    public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {

        if(null ==dto.getBldhs() || dto.getBldhs().size()==0){
            return AjaxResult.error("请选择要撤销的补录项目");
        }

        TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh());
        if (null != order) {
            String configByKey = configService.selectConfigByKey("sfkqdyhis");
            if(null !=configByKey && configByKey.equals("Y")){
                HashMap<String, Object> hisRequestParams = new HashMap<>();
                hisRequestParams.put("patientId",order.getCardId());
                AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
                    List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
                    BigDecimal cateFeeAll = BigDecimal.ZERO;
                    List<String> advIds=new ArrayList<>();
                    for (Map<String, String> datum : data) {
                        String advId = datum.get("Adv_Id").split("_")[1];
                        BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
                        cateFeeAll = cateFeeAll.add(cateFee);
                        advIds.add(advId);
                    }
                    if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO)!=0 ){
                        return AjaxResult.error("改项目已缴费不可撤销!!!");
                    }
                }
            }
            for (String bldh : dto.getBldhs()) {
               remarkService.deleteTjOrderDetailByjxbz(bldh);
                tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
                tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
                transitionService.deleteTjOrderDetailByjxbz(bldh);
                blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh,dto.getTjh()).eq(TjProBl::getBldh,bldh));
            }
            return AjaxResult.success();
        }
        return AjaxResult.error();
    }
}


 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/LtkjJianchajianyanTree.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
@@ -60,6 +62,13 @@
     */
    private String pationid;

    //是否加项
    private String sfjx;


    //加项标志
    private String jxbz;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java

@@ -79,6 +79,9 @@
    @ApiModelProperty(value = "体检唯一号")
    private String cardId;

    @ApiModelProperty(value = "加项标志")
    private String jxbz;

    @ApiModelProperty("唯一标识")
    @TableField(exist = false)
    private String onlyId;

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java

@@ -177,6 +177,9 @@

    private String remarks;

    @ApiModelProperty(value = "加项标志")
    private String jxbz;


    @Override
    public String toString() {

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java

@@ -64,6 +64,8 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long proId;

    private String prosId;

    /**
     * 标准结果(关联标准表)
     */
@@ -110,6 +112,9 @@
    @ApiModelProperty(value = "是否为加项")
    private String isAddition;

    @ApiModelProperty(value = "加项标志")
    private String jxbz;

    @ApiModelProperty(value = "流水id")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String flowingWaterId;

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java

@@ -44,6 +44,8 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long proId;

    private String prosId;

    @ApiModelProperty(value = "父项目名称")
    @TableField(exist = false)
    private String proName;
@@ -116,6 +118,9 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date yqDeadline;

    @ApiModelProperty(value = "加项标志")
    private String jxbz;

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProBl.java

New file
@@ -0,0 +1,30 @@
package com.ltkj.hosp.domain;
/*
 * @Authot:zjh
 * @Date:  2024-07-05   13:49
 * */

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

import java.util.List;

@Data
public class TjProBl {

    @TableId (type = IdType.AUTO)
    @JsonSerialize (using = ToStringSerializer.class)
    private Long id;
    private String tjh;
    private String bldh;
    private String blsj;
    private String blrdm;
    private String blrmc;
    private String blje;
    @TableField(exist = false)
    private List<TjProject> projectList ;
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/dto/TjProBlDto.java

New file
@@ -0,0 +1,14 @@
package com.ltkj.hosp.dto;/*
 * @Authot:zjh
 * @Date:  2024-07-05   13:58
 * */

import lombok.Data;

import java.util.List;

@Data
public class TjProBlDto {
    private List<String> bldhs;
    private String tjh;
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java

@@ -4,7 +4,12 @@
import com.ltkj.common.annotation.DataSource;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @Company: 西安路泰科技有限公司
@@ -14,4 +19,13 @@
@Mapper
@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {

    @Delete ("DELETE FROM ltkj_exam_jcbgd WHERE tmh=#{tmh} ")
    void  deletedLtkjJcbgdByTjhAndTmh(String tmh);

    @Select ("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检查' GROUP BY a.sqdh")
    List<String> getJianJcBaoGaoDan(String cardId);

    @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tmh=#{tmh}")
    List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java

@@ -5,7 +5,10 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import org.apache.ibatis.annotations.Mapper;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import org.apache.ibatis.annotations.*;

import java.util.List;

/**
 * @Company: 西安路泰科技有限公司
@@ -15,4 +18,20 @@
@Mapper
@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcsqdMapper extends BaseMapper<LtkjExamJcsqd> {

    @Select ("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh} ")
    LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh") String tmh);

    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} AND tmh=#{tmh} ")
    void  deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh,@Param("tmh")String tmh);

    @Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
    List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);


    @Insert("INSERT INTO  ltkj_exam_jcsqd \n" +
            "SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
            "CONCAT(a.bg_nr,'(',a.yxzd,',',a.yxbx,')') jgzt\n" +
            "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.tmh;")
    void saveLtkjExamJcsqd(String tjh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java

@@ -25,7 +25,7 @@
    void  deletedLtkjHybgdByTjhAndTmh(String tmh);


    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检验' GROUP BY a.sqdh")
    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND (a.type='检验' OR a.type='检查') GROUP BY a.sqdh")
    List<String> getJianYanBaoGaoDan(String cardId);

    @Select("SELECT * FROM ltkj_hybgd WHERE tmh=#{tmh}")

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java

@@ -239,4 +239,7 @@
            "\tAND a.tj_num = #{tjNumber}")
    boolean updateCardIdByTjNumAndIdCard(@Param("idCard")String idCard,@Param("cardId")String cardId,@Param("tjNumber") String tjNumber);


    @Delete("DELETE  FROM tb_transition WHERE jxbz=#{bldh}")
    void deleteTjOrderDetailByjxbz(String bldh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java

@@ -99,4 +99,9 @@
            " from tj_flowing_water" +
            " where order_id = #{order}")
    public int deleteTjFlowingWaterByOrderId(String order);

    @Delete("  delete" +
            " from tj_flowing_water" +
            " where jxbz = #{bldh}")
    void deleteTjOrderDetailByjxbz(String bldh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java

@@ -185,4 +185,13 @@
    @Select("call pro_lis_sqdbgd(1,#{tjnumber,mode=IN})")
//    @Select("select * from test_detail")
    List<TjOrderDetail> addHuaYanTable(@Param("tjnumber") String tjnumber);

    @Select("call pro_checkhyAndcg(1,#{tjnumber,mode=IN})")
    List<TjOrderDetail> addHuaYanAndCgTable(String tjnumber);


    @Delete("delete\n" +
            " from tj_order_detail\n" +
            " where jxbz = #{jxbz}")
    void deleteTjOrderDetailByjxbz(String jxbz);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java

@@ -134,7 +134,13 @@
//    @Select("select * from test_remark")
    List<TjOrderRemark> addHuaYanTable(@Param("tjnumber") String tjnumber);

    @Select("call pro_checkhyAndcg(0,#{tjnumber,mode=IN})")
    List<TjOrderRemark> addHuaYanAndCgTable(@Param("tjnumber")String tjnumber);


    @Update("UPDATE tj_order_remark a SET a.type=2 WHERE a.tj_number=#{tjnumber} AND a.pro_id=#{proId}")
    void updateTjOrderRemark(@Param("tjnumber")String tjnumber,@Param("proId")String proId);

    @Delete("DELETE  FROM tj_order_remark WHERE jxbz=#{bldh}")
    void deleteTjOrderDetailByjxbz(String bldh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProBlMapper.java

New file
@@ -0,0 +1,12 @@
package com.ltkj.hosp.mapper;/*
 * @Authot:zjh
 * @Date:  2024-07-05   13:52
 * */

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjProBl;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface TjProBlMapper extends BaseMapper<TjProBl> {
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java

@@ -122,4 +122,6 @@


     boolean updateCardIdByTjNumAndIdCard(String idCard,String cardId,String tjNumber);

    void deleteTjOrderDetailByjxbz(String bldh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java

@@ -73,4 +73,6 @@


    public int deleteTjFlowingWaterByOrderId(String order);

    void deleteTjOrderDetailByjxbz(String bldh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java

@@ -107,4 +107,8 @@


    List<TjOrderDetail> addHuaYanTable(String tjnumber);

    List<TjOrderDetail> addHuaYanAndCgTable(String tjnumber);

    void deleteTjOrderDetailByjxbz(String jxbz);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java

@@ -47,7 +47,10 @@

    List<TjOrderRemark> addHuaYanTable(String tjnumber);

    List<TjOrderRemark> addHuaYanAndCgTable(String tjnumber);


    void updateTjOrderRemark(String tjnumber,String proId);

    void deleteTjOrderDetailByjxbz(String bldh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcbgdService.java

@@ -2,7 +2,10 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;

import java.util.List;

/**
 * @Company: 西安路泰科技有限公司
@@ -10,4 +13,11 @@
 * @Date: 2023/12/11 17:57
 */
public interface LtkjExamJcbgdService extends IService<LtkjExamJcbgd> {


    void  deletedLtkjJcbgdByTjhAndTmh(String tmh);

    List<String> getJianJcBaoGaoDan(String cardId);

    List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java

@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;

import java.util.List;

/**
 * @Company: 西安路泰科技有限公司
@@ -10,4 +13,13 @@
 * @Date: 2023/12/11 17:57
 */
public interface LtkjExamJcsqdService extends IService<LtkjExamJcsqd> {

    LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(String tjh, String tmh);


    void  deletedLtkjJcsqdByTjhAndTmh(String tjh,String tmh);

    List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh);

    void saveLtkjExamJcsqd(String tjh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProBlService.java

New file
@@ -0,0 +1,10 @@
package com.ltkj.hosp.service;/*
 * @Authot:zjh
 * @Date:  2024-07-05   13:53
 * */

import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjProBl;

public interface TjProBlService extends IService<TjProBl> {
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcbgdServiceImpl.java

@@ -6,8 +6,12 @@
import com.ltkj.hosp.service.LtkjExamJcbgdService;
import com.ltkj.hosp.service.LtkjMiddleDetailService;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * 病种+意见Service业务层处理
@@ -18,4 +22,21 @@
@Service
public class LtkjExamJcbgdServiceImpl extends ServiceImpl<LtkjExamJcbgdMapper, LtkjExamJcbgd> implements LtkjExamJcbgdService {

    @Resource
    private LtkjExamJcbgdMapper mapper;

    @Override
    public void deletedLtkjJcbgdByTjhAndTmh(String tmh) {
        mapper.deletedLtkjJcbgdByTjhAndTmh(tmh);
    }

    @Override
    public List<String> getJianJcBaoGaoDan(String cardId) {
        return mapper.getJianJcBaoGaoDan(cardId);
    }

    @Override
    public List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh) {
        return mapper.getJianJcBaoGaoDanList(tmh);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java

@@ -7,7 +7,11 @@
import com.ltkj.hosp.service.LtkjExamJcsqdService;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * 病种+意见Service业务层处理
@@ -18,4 +22,27 @@
@Service
public class LtkjExamJcsqdServiceImpl extends ServiceImpl<LtkjExamJcsqdMapper, LtkjExamJcsqd> implements LtkjExamJcsqdService {

    @Resource
    private LtkjExamJcsqdMapper mapper;


    @Override
    public LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(String tjh, String tmh) {
        return mapper.getLtkjJcsqdByTjhAndTmh(tjh,tmh);
    }

    @Override
    public void deletedLtkjJcsqdByTjhAndTmh(String tjh, String tmh) {
            mapper.deletedLtkjJcsqdByTjhAndTmh(tjh,tmh);
    }

    @Override
    public List<LtkjExamJcsqd> getLtkjJcsqdByTjh(String tjh) {
        return mapper.getLtkjJcsqdByTjh(tjh);
    }

    @Override
    public void saveLtkjExamJcsqd(String tjh) {
        mapper.saveLtkjExamJcsqd(tjh);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java

@@ -196,4 +196,9 @@
    public boolean updateCardIdByTjNumAndIdCard(String idCard, String cardId,String tjNumber) {
        return tbTransitionMapper.updateCardIdByTjNumAndIdCard(idCard,cardId,tjNumber);
    }

    @Override
    public void deleteTjOrderDetailByjxbz(String bldh) {
        tbTransitionMapper.deleteTjOrderDetailByjxbz(bldh);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java

@@ -118,4 +118,9 @@
    public int deleteTjFlowingWaterByOrderId(String order) {
        return tjFlowingWaterMapper.deleteTjFlowingWaterByOrderId(order);
    }

    @Override
    public void deleteTjOrderDetailByjxbz(String bldh) {
        tjFlowingWaterMapper.deleteTjOrderDetailByjxbz(bldh);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java

@@ -174,4 +174,14 @@
        return tjOrderDetailMapper.addHuaYanTable(tjnumber);
    }

    @Override
    public List<TjOrderDetail> addHuaYanAndCgTable(String tjnumber) {
        return tjOrderDetailMapper.addHuaYanAndCgTable(tjnumber);
    }

    @Override
    public void deleteTjOrderDetailByjxbz(String jxbz) {
         tjOrderDetailMapper.deleteTjOrderDetailByjxbz(jxbz);
    }

}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java

@@ -93,8 +93,18 @@
    }

    @Override
    public List<TjOrderRemark> addHuaYanAndCgTable(String tjnumber) {
        return mapper.addHuaYanAndCgTable(tjnumber);
    }

    @Override
    public void updateTjOrderRemark(String tjnumber, String proId) {
        mapper.updateTjOrderRemark(tjnumber,proId);
    }

    @Override
    public void deleteTjOrderDetailByjxbz(String bldh) {
        mapper.deleteTjOrderDetailByjxbz(bldh);
    }

}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProBlServiceImpl.java

New file
@@ -0,0 +1,14 @@
package com.ltkj.hosp.service.impl;/*
 * @Authot:zjh
 * @Date:  2024-07-05   13:54
 * */

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.TjProBl;
import com.ltkj.hosp.mapper.TjProBlMapper;
import com.ltkj.hosp.service.TjProBlService;
import org.springframework.stereotype.Service;

@Service
public class TjProBlServiceImpl extends ServiceImpl<TjProBlMapper, TjProBl> implements TjProBlService {
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java

@@ -1,5 +1,9 @@
package com.ltkj.hosp.sqlDomain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;

/**
@@ -9,8 +13,20 @@
 */
@Data
public class LtkjExamJcbgd {

    @TableId(type = IdType.AUTO)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    private String tjh;
    private String tmh;
    private String xmdm;
    private String xmmc;
    private String bgImg;
    private String bgUrl;
    private String bgNr;
    private String shysxm;
    private String shysdm;
    private String yxzd;
    private String yxbx;
    private String zdsj;
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java

@@ -39,6 +39,9 @@
    private String shrdm;
    @ApiModelProperty(value = "审核人姓名")
    private String shrxm;
    @ApiModelProperty(value = "检验报告结果")
    private String jybgjg;



}