zjh
2024-12-10 da9cb628948b381015faf188283a90a3aa15ce62
zjh202412010
16个文件已修改
5个文件已添加
447 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethod.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java 176 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/createMenZhenFyDto.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/feiYongMxDto.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethod.java
New file
@@ -0,0 +1,17 @@
package com.ltkj.web.controller.dongfanghis;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
 * ClassName: HisApiMethod <br/>
 * Description: <br/>
 * date: 2024/12/10 08:51<br/>
 *
 * @author zjh<br />
 */
@Slf4j
@Component
public class DfHisApiMethod {
}
ltkj-admin/src/main/java/com/ltkj/web/controller/dongfanghis/DfHisApiMethodService.java
New file
@@ -0,0 +1,176 @@
package com.ltkj.web.controller.dongfanghis;
import cn.hutool.core.date.DateUtil;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.web.wxUtils.HttpClientUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
/**
 * ClassName: DfHisApiMethodService <br/>
 * Description: <br/>
 * date: 2024/12/10 09:24<br/>
 *
 * @author zjh<br />
 */
@Component
@Slf4j
public class DfHisApiMethodService {
    private static  String HIS_URL = "";
    private static String CONFIG_PATH;
    private static  String GRANT_TYPE = "";
    private static  String CLIENT_ID = "";
    private static  String CLIENT_SECRET = "";
    private static  String SCOP = "";
//    @Autowired
//    private RedisTemplate<String,Object> redisTemplate;
    @Value("${config.properties}")
    public void setConfigPath(String configPath) {
        CONFIG_PATH = configPath;
        try {
            FileInputStream inputStream = new FileInputStream(CONFIG_PATH);
            Properties props = new Properties();
            props.load(inputStream);
            String url = props.getProperty("df_his_api_url");
            String port = props.getProperty("df_his_api_port");
            GRANT_TYPE = props.getProperty("grant_type");
            CLIENT_ID= props.getProperty("client_id");
            CLIENT_SECRET = props.getProperty("client_secret");
            SCOP = props.getProperty("scope");
            HIS_URL=url+":"+port+"/OAPI/";
        } catch (IOException throwables) {
            throwables.printStackTrace();
        }
    }
    //获取token
    public AjaxResult getToken () {
        Map<String, Object> map = new HashMap<>();
        map.put("grant_type",GRANT_TYPE);
        map.put("client_id",CLIENT_ID);
        map.put("client_secret",CLIENT_SECRET);
        map.put("scope",SCOP);
        String post = HttpClientUtils.sendPost (HIS_URL+"/oauth/token", map);
        return AjaxResult.success ().put ("data", post);
    }
    //建档
    public AjaxResult jianDang (TjCustomer customer) {
        Map<String, Object> map = new HashMap<> ();
        map.put ("jiuZhenKh", customer.getPationId ());
        map.put ("kaiLeiXing","4");
        map.put ("xingMing", customer.getCusName ());
        Long cusSex = customer.getCusSex();
        if(cusSex==0L){
            map.put ("xingBie",1);
        }else if(cusSex==1L){
            map.put ("xingBie",2);
        }else {
            map.put ("xingBie",9);
        }
        map.put ("shenFenZh", customer.getCusIdcard ());
        map.put ("danWeiBh","");
        map.put ("chuShengRq", DateUtil.format(customer.getCusBrithday(),"yyyy-MM-dd"));
        map.put ("lianXiDz", customer.getCusAddr());
        map.put ("lianXiDh", customer.getCusPhone ());
        map.put ("feiYongLb","");
        map.put ("feiYongXz","");
        map.put ("jiLuLy","3");
        map.put ("caoZuoYuan","1088");
        map.put ("chongZhiJe","");
        map.put ("yiBaoKh","");
        map.put ("geRenBh","");
        map.put ("yiBaoBrXx","");
        map.put ("gongZuoDw",customer.getCompName());
        map.put ("canBaoXzMc","");
        map.put ("muLuBlLb","");
        map.put ("kunNanJzDj","");
        map.put ("yiLiaoLb","");
        map.put ("minZuDm","");
        map.put ("minZuMc","");
        //职业编码
        String post = HttpClientUtils.sendPost (HIS_URL+"/menZhenJz/jianDang", map);
        return AjaxResult.success ().put ("data", post);
    }
    //验证身份证是否建过档
    public AjaxResult getBingRenXxByShengFenZheng (TjCustomer customer) {
        Map<String, Object> map = new HashMap<> ();
        map.put ("caoZuoYuan","1088");
        map.put ("shenFenZh", customer.getCusIdcard ());
        map.put ("danWeiBh","");
        //职业编码
        String post = HttpClientUtils.sendPost (HIS_URL+"/menZhenJz/getBingRenXxByShengFenZheng", map);
        return AjaxResult.success ().put ("data", post);
    }
    //病人基本信息变更
    public AjaxResult saveBingRenXx (TjCustomer customer) {
        Map<String, Object> map = new HashMap<> ();
        map.put ("jiuZhenKh", customer.getPationId ());
        map.put ("kaiLeiXing","4");
        map.put ("xingMing", customer.getCusName ());
        Long cusSex = customer.getCusSex();
        if(cusSex==0L){
            map.put ("xingBie",1);
        }else if(cusSex==1L){
            map.put ("xingBie",2);
        }else {
            map.put ("xingBie",9);
        }
        map.put ("shenFenZh", customer.getCusIdcard ());
        map.put ("danWeiBh","");
        map.put ("chuShengRq", DateUtil.format(customer.getCusBrithday(),"yyyy-MM-dd"));
        map.put ("lianXiDz", customer.getCusAddr());
        map.put ("lianXiDh", customer.getCusPhone ());
        map.put ("feiYongLb","");
        map.put ("feiYongXz","");
        map.put ("jiLuLy","3");
        map.put ("caoZuoYuan","1088");
        //职业编码
        String post = HttpClientUtils.sendPost (HIS_URL+"/menZhenJz/saveBingRenXx", map);
        return AjaxResult.success ().put ("data", post);
    }
    //待收费费用查询
    public AjaxResult getListDaiShouFei (String bingRenId,String jiuZhenKh,String yuanQuId) {
        Map<String, Object> map = new HashMap<> ();
        map.put ("bingRenId",bingRenId);
        map.put ("jiuZhenKh",jiuZhenKh);
        map.put ("yuanQuId",yuanQuId);
        //职业编码
        String post = HttpClientUtils.sendPost (HIS_URL+"/shouFei/getListDaiShouFei", map);
        return AjaxResult.success ().put ("data", post);
    }
    //待收费费用查询
    public AjaxResult createMenZhenFy (String bingRenId,String jiuZhenKh,String yuanQuId) {
        Map<String, Object> map = new HashMap<> ();
        map.put ("bingRenId",bingRenId);
        map.put ("jiuZhenKh",jiuZhenKh);
        map.put ("yuanQuId",yuanQuId);
        //职业编码
        String post = HttpClientUtils.sendPost (HIS_URL+"/shouFei/createMenZhenFy", map);
        return AjaxResult.success ().put ("data", post);
    }
}
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1394,9 +1394,10 @@
                asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
                return AjaxResult.success("操作成功");
            }
            asyncService.updateCheckType(orderRemark.getTjNumber());
            asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
//            asyncService.updateCheckType(orderRemark.getTjNumber());
//            asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
        }
        remarkService.tjYishengjianchajianyi(null,null,null,null);
        return AjaxResult.success("操作成功");
    }
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -25,6 +25,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -194,6 +195,8 @@
    @GetMapping("/list")
    @ApiOperation(value = "体检建议列表查询")
    public AjaxResult list(@RequestParam(required = false) @ApiParam(value = "项目名") String proName,
                           @ApiParam(value = "标题") @RequestParam(required = false) String bt,
                           @ApiParam(value = "建议") @RequestParam(required = false) String nr,
                           @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                           @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
        Page<TjAdvice> page1 = new Page<>(page, pageSize);
@@ -205,16 +208,16 @@
            list = new ArrayList<>();
            wq.like(TjProject::getProName, proName);
            List<TjProject> projectList = tjProjectService.list(wq);
            if (null != projectList && projectList.size() > 0) {
            if (null != projectList && !projectList.isEmpty()) {
                for (TjProject project : projectList) {
                    LambdaQueryWrapper<TjAdvice> wqq = new LambdaQueryWrapper<>();
                    wqq.eq(TjAdvice::getProId, project.getProId());
                    IPage<TjAdvice> adviceList = tjAdviceService.page(page1, wqq);
                    if (null != adviceList.getRecords() && adviceList.getRecords().size() > 0) {
                    if (null != adviceList.getRecords() && !adviceList.getRecords().isEmpty()) {
                        for (TjAdvice record : adviceList.getRecords()) {
                            record.setProName(project.getProName());
                            String kjbq = record.getKjbq();
                            if(null !=kjbq && !kjbq.equals("")){
                            if(null !=kjbq && !kjbq.isEmpty()){
                                String[] split = kjbq.split(",");
                                record.setKjbqz(Arrays.asList(split));
                            }
@@ -228,9 +231,12 @@
            map.put("total", total);
            return AjaxResult.success(map);
        }
        Page<TjAdvice> page2 = tjAdviceService.page(page1);
        LambdaQueryWrapper<TjAdvice> wq=new LambdaQueryWrapper<>();
        if(!StringUtil.isBlank(bt)) wq.like(TjAdvice::getTitle,bt);
        if(!StringUtil.isBlank(nr)) wq.like(TjAdvice::getAdvice,nr);
        Page<TjAdvice> page2 = tjAdviceService.page(page1,wq);
        list = page2.getRecords();
        if (null != list && list.size() > 0) {
        if (null != list && !list.isEmpty()) {
            for (TjAdvice advice : list) {
                TjProject tjProject = tjProjectService.getById(advice.getProId());
                if (null != tjProject) {
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -667,6 +667,7 @@
                        testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                    }
                  //检查
                    orderService.tjLispacstongbujianyi(null,null,null,null);
                    return AjaxResult.success("同步成功");
                }
                return AjaxResult.error("未查到该人员体检记录");
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -997,6 +997,7 @@
                AjaxResult result = processOrderWithTransaction(tjOrder, tjCustomer, tjReservation, tjFlowingWater, mallOrder, sysUser);
                if (!result.get("code").toString().equals("200"))
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
                return result;
            }
        } finally {
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -346,7 +346,7 @@
            LambdaQueryWrapper<TjPackageProject> wq1 = new LambdaQueryWrapper<>();
            wq1.eq(TjPackageProject::getProId, tjProject.getProId());
            List<TjPackageProject> list1 = ppservice.list(wq1);
            if (null != list1 && list1.size() > 0) {
            if (null != list1 && !list1.isEmpty()) {
                return AjaxResult.error("该项目正在套餐中使用,暂时不能停用");
            }
        }
@@ -374,7 +374,7 @@
                    }
                }
                List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
                if (null != list && list.size() > 0) {
                if (null != list && !list.isEmpty()) {
                    for (TjProject project : list) {
                        project.setDeptId(tjProject.getDeptId());
                        project.setProType(tjProject.getProType());
@@ -385,7 +385,7 @@
                    }
                }
                List<TjConsumables> consumablesList = tjProject.getConsumablesList();
                if (null != consumablesList && consumablesList.size() > 0) {
                if (null != consumablesList && !consumablesList.isEmpty()) {
                    LambdaQueryWrapper<TjProConsumables> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjProConsumables::getProId, tjProject.getProId());
                    proConsumablesService.remove(wq);
@@ -426,7 +426,7 @@
                }
            }
            List<TjStandard> tjStandardList = tjProject.getTjStandardList();
            if (null != tjStandardList && tjStandardList.size() > 0) {
            if (null != tjStandardList && !tjStandardList.isEmpty()) {
                for (TjStandard tjStandard : tjStandardList) {
                    if (null == tjStandard.getTjSex()) {
                        tjStandard.setTjSex(null);
@@ -442,8 +442,10 @@
            if (null != proParentId) {
                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                wq.eq(TjProject::getProParentId, proParentId);
                List<TjProject> projectList = tjProjectService.list(wq);
                if (null != projectList && projectList.size() > 0) {
                wq.eq(TjProject::getProStatus,0);
//                List<TjProject> projectList = tjProjectService.list(wq);
                List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId));
                if (null != projectList && !projectList.isEmpty()) {
                    BigDecimal bigDecimal = new BigDecimal("0.00");
                    for (TjProject project : projectList) {
                        bigDecimal = bigDecimal.add(project.getProPrice());
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -697,7 +697,8 @@
                TjReservation reservation = tjReservationService.getById(id);
                if (null != reservation && reservation.getIsExpire() == 2) {
                    if (tjReservationService.removeById(id)) {
                        transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard()));
                        transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard())
                                .isNull(TbTransition::getTjNum));
                        taskService.removeTask(new TjReservationTask(id));
                    }
                }
ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
@@ -346,4 +346,49 @@
    }
    public static String sendPost(String httpUrl, Map<String, Object> maps,String token) {
        try {
            // 1. 创建 URL 对象
            URL url = new URL(httpUrl);
            // 2. 创建 HttpURLConnection 对象
            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
            // 3. 设置请求方法为 POST
            connection.setRequestMethod("POST");
            // 4. 设置 Content-Type 头部字段
            connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
            //设置请求token
            connection.setRequestProperty("Authorization",token);
            // 6. 向服务器发送数据
            String requestBody = JSONUtil.toJsonStr(maps);
            log.info(httpUrl+"入参:   "+requestBody);
//            String requestBody1 = maps.toString();
            byte[] postData = requestBody.getBytes("UTF-8");
            connection.setDoOutput(true);
            try (OutputStream outputStream = connection.getOutputStream()) {
                outputStream.write(postData);
            }
            // 8. 获取响应数据
            try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
                String line;
                StringBuilder response = new StringBuilder();
                while ((line = reader.readLine()) != null) {
                    response.append(line);
                }
                log.info("=====================================================");
                log.info(httpUrl+"出参");
                log.info(response.toString());
                connection.disconnect();
                return response.toString();
            }
        } catch (IOException e) {
            e.printStackTrace();
        }
        return null;
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/createMenZhenFyDto.java
New file
@@ -0,0 +1,38 @@
package com.ltkj.hosp.dfDto;
import lombok.Data;
import java.util.List;
/**
 * ClassName: createMenZhenFyDto <br/>
 * Description: <br/>
 * date: 2024/12/10 11:57<br/>
 *
 * @author zjh<br />
 */
@Data
public class createMenZhenFyDto {
    //病人Id(在HIS中的唯一码)
    private String bingRenId;
    //就诊卡号
    private String jiuZhenKh;
    //操作员(收费人员/体检/自助机)
    private String caoZuoYuan;
    //院区Id
    private String yuanQuId;
    //应用Id(自助机传010101,体检 870101)
    private String yingYongId;
    //开单科室
    private String kaiDanKs;
    //登记流水号
    private String dengJiLsh;
    //收退标志(1:生成待收费, 2生成待退费)
    private String shouTuiBz;
    //费用明细
    private List<feiYongMxDto> feiYongMxList;
}
ltkj-hosp/src/main/java/com/ltkj/hosp/dfDto/feiYongMxDto.java
New file
@@ -0,0 +1,35 @@
package com.ltkj.hosp.dfDto;
import lombok.Data;
import org.apache.poi.hpsf.Decimal;
import java.math.BigDecimal;
/**
 * ClassName: feiYongMxDto <br/>
 * Description: <br/>
 * date: 2024/12/10 11:57<br/>
 *
 * @author zjh<br />
 */
@Data
public class feiYongMxDto {
    //费用明细Id(退费必传)
    private String feiYongMxId;
    //费用Id(退费必传)
    private String feiYongId;
    //收费项目Id(HIS的)
    private String shouFeiXmId;
    //收费项目名称
    private String shouFeiXmMc;
    //数量(退费为负)
    private Integer shuLiang;
    //单价
    private BigDecimal danJia;
    //结算金额(退费为负)
    private BigDecimal jieSuanJe;
    //执行科室
    private String zhiXingKs;
    //执行科室名称
    private String zhiXingKsMc;
}
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjRules.java
@@ -151,6 +151,13 @@
     */
    private String groupId;
    //建议id
    private String adviceId;
    //建议内容
    private String adviceNr;
    //建议标题
    private String adviceBt;
    @TableField(exist = false)
    private List<TjRuleAdvice> ruleAdvices;
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -321,4 +321,11 @@
            "  AND b.org_type = 2 \n" +
            "  AND a.type !=1")
    List<String> getDingShiTongBuJianChaTjNum();
    void tjQiandaodengji(Map<String,Object> map);
    void tjLispacstongbujianyi(Map<String, Object> map);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.mapper;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrderRemark;
@@ -179,4 +180,7 @@
    @Select("call tj_check_yclist(0,#{tjnumber,mode=IN})")
    List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber);
    void tjYishengjianchajianyi(Map<String,Object> map);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -65,14 +65,14 @@
     */
    public int deleteTjProjectByProIds(Long[] proIds);
    @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0'")
    @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0")
    public List<TjProject> getTjProjectListBySoneId(@Param("proId") String proId);
    @Select("SELECT * FROM tj_project WHERE pro_id=#{proId} AND deleted='0'")
    public TjProject getTjProjectById(@Param("proId") String proId);
    @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' ")
    @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0 ")
    String appendTjProjectName(String proId);
    @Select("SELECT a.pro_id FROM tj_project a WHERE a.dept_id=#{ksId}  AND a.pro_status=0 AND a.deleted='0' ")
@@ -88,13 +88,13 @@
    String appendTjProjectNames(@Param("proIds")String[] proIds);
    @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' ")
    @Select("SELECT GROUP_CONCAT(pro_name ORDER BY pro_name) AS names FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0")
    String getAllSonNames(String proId);
    @Select("SELECT GROUP_CONCAT(c.pro_name ) AS names FROM tj_package a LEFT JOIN tj_package_project b ON a.pac_id=b.pac_id LEFT JOIN tj_project c ON b.pro_id=c.pro_id  WHERE a.pac_id=#{pacId}")
    String getAllNamesByPacId(String pacId);
    @Select("SELECT sum(pro_price) pro_price FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' ")
    @Select("SELECT sum(pro_price) pro_price FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_status=0 ")
    BigDecimal getMoneys(String proId);
    @Select("SELECT * FROM tj_project WHERE pro_id=#{proId} AND pro_parent_id='0' AND deleted='0' ")
@@ -132,7 +132,7 @@
            ")) aa LEFT JOIN tj_project c ON aa.pro_id=c.pro_id  ")
    List<TjProject> getTjProListByPacIdAndDeptId(String pacId);
    @Select("SELECT * FROM `tj_project` where pro_parent_id=#{proId}")
    @Select("SELECT * FROM `tj_project` where pro_parent_id=#{proId} and pro_status=0")
    List<TjProject> getAllChildListById(String proId);
    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0")
@@ -152,10 +152,10 @@
    List<TjProject> getPacTjProjectList();
    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A30' AND a.need_report='Y'")
    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A30' AND a.need_report='Y' and a.pro_status=0")
    List<Long> getHuaYanProId();
    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A32' AND a.need_report='Y'")
    @Select("SELECT a.pro_id FROM tj_project a  JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A32' AND a.need_report='Y' and a.pro_status=0")
    List<Long> getYingXiangProId();
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -9,6 +9,7 @@
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.validation.constraints.Size;
import java.util.List;
/**
@@ -70,4 +71,6 @@
    List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber);
    List<TjOrderRemark> pacsJianChaData(String tjnumber);
    void tjYishengjianchajianyi(String tjNumber, Long deptId,String nickName, Long userId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -181,4 +181,7 @@
    List<String> getDingShiTongBuJianChaTjNum();
    void tjQiandaodengji(String tjNum);
    void tjLispacstongbujianyi(String tjNumber, Long deptId,String nickName, Long userId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -10,7 +10,9 @@
import javax.annotation.Resource;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 医生备注Service业务层处理
@@ -128,4 +130,15 @@
        return mapper.pacsJianChaData(tjnumber);
    }
    @Override
    public void tjYishengjianchajianyi(String tjNumber, Long deptId, String nickName, Long userId) {
        Map<String,Object> map=new HashMap<>();
        map.put("tjNum",tjNumber);
        map.put("ksId",deptId.toString());
        map.put("ysxm",nickName);
        map.put("ysid",userId.toString());
        mapper.tjYishengjianchajianyi(map);
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -403,4 +403,21 @@
    public List<String> getDingShiTongBuJianChaTjNum() {
        return tjOrderMapper.getDingShiTongBuJianChaTjNum();
    }
    @Override
    public void tjQiandaodengji(String tjNum) {
        Map<String, Object> map = new HashMap<>();
        map.put("tjNum",tjNum);
        tjOrderMapper.tjQiandaodengji(map);
    }
    @Override
    public void tjLispacstongbujianyi(String tjNumber, Long deptId, String nickName, Long userId) {
        Map<String, Object> map = new HashMap<>();
        map.put("tjNum",tjNumber);
        map.put("ksId",deptId.toString());
        map.put("ysxm",nickName);
        map.put("ysid",userId.toString());
        tjOrderMapper.tjLispacstongbujianyi(map);
    }
}
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderMapper.xml
@@ -383,5 +383,17 @@
                #{total,mode=OUT,jdbcType=INTEGER}
              )}
    </select>
    <select id="tjQiandaodengji"  parameterType="java.util.Map"  statementType="CALLABLE" resultType="java.util.Map">
        {call tj_qiandaodengji(
                #{tjNum,mode=IN,jdbcType=VARCHAR}
              )}
    </select>
    <select id="tjLispacstongbujianyi"  parameterType="java.util.Map"  statementType="CALLABLE" resultType="java.util.Map">
        {call tj_lispacstongbujianyi(
                #{tjNum,mode=IN,jdbcType=VARCHAR},
                #{ksId,mode=IN,jdbcType=VARCHAR},
                #{ysxm,mode=IN,jdbcType=VARCHAR},
                #{ysid,mode=IN,jdbcType=VARCHAR}              )}
    </select>
</mapper>
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml
New file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ltkj.hosp.mapper.TjOrderRemarkMapper">
    <select id="tjYishengjianchajianyi"  parameterType="java.util.Map"  statementType="CALLABLE" resultType="java.util.Map">
        {call tj_yishengjianchajianyi(
                #{tjNum,mode=IN,jdbcType=VARCHAR},
                #{ksId,mode=IN,jdbcType=VARCHAR},
                #{ysxm,mode=IN,jdbcType=VARCHAR},
                #{ysid,mode=IN,jdbcType=VARCHAR}
              )}
    </select>
</mapper>