zjh
2025-05-16 2359d57cf9074650c25956ae9591c1a2e43a873d
zjh20250516
7个文件已修改
126 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/test/java/zjhTest.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -159,7 +159,9 @@
                                if(null !=list && !list.isEmpty()){
                                    for (LtkjExamJcsqd jcsqd : list) {
                                        if(StringUtil.isNotBlank(jcsqd.getJgzt())){
                                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|;|;");
                                            String regex = configService.selectConfigByKey("jcycxmzz");
                                            if(StringUtil.isBlank(regex)) regex= "。|;|;|,|,";
                                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
                                            for (String jg : split) {
                                                if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                                        && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -16,6 +16,7 @@
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.domain.TjJcycxm;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
@@ -387,23 +388,36 @@
    @GetMapping ("/tjjcycxm")//同步his项目单价信息
//    @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')")
    @ApiOperation (value = "tjjcycxm")
    public AjaxResult tjjcycxm() {
    public AjaxResult tjjcycxm(@ApiParam("体检号") @RequestParam(required = false)String tjh) {
        String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
        if(StringUtil.isNotBlank(tjh)){
            extracted(tjh, yqbm);
        }else {
        List<String> jc = orderService.getJianChaTjNum();
        if (null != jc && !jc.isEmpty()) {
            for (String s : jc) {
                jcycxmService.deletedByTjh(s);
                List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s);
                    extracted(s, yqbm);
                }
            }
        }
        return AjaxResult.success();
    }
    private void extracted(String s, String yqbm) {
        TjOrder order = orderService.getOrderByTjNum(s);
        jcycxmService.deletedByTjh(order.getCardId());
        List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId());
                if(null !=list && !list.isEmpty()){
                    for (LtkjExamJcsqd jcsqd : list) {
                        if(StringUtil.isNotBlank(jcsqd.getJgzt())){
                            String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|;|;");
                    String regex = configService.selectConfigByKey("jcycxmzz");
                    if(StringUtil.isBlank(regex)) regex= "。|;|;|,|,";
                    System.out.println("jcycxmzz值为"+regex);
                    String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex);
                            for (String jg : split) {
                                if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                        && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
                                && !jg.contains("未见明显异常") && !jg.matches("\\d+")  && !jg.contains("未见占位") && !jg.contains("未见")
                                        && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")&& !jg.contains("无殊")){
                                    TjJcycxm jcycxm=new TjJcycxm();
                                    jcycxm.setTjh(s);
@@ -419,10 +433,6 @@
                        }
                    }
                }
            }
        }
        return AjaxResult.success();
    }
}
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAskMedicalHistoryController.java
@@ -8,6 +8,7 @@
import cn.hutool.core.bean.BeanUtil;
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.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
@@ -125,13 +126,23 @@
                    askWorkLog.setHarmTypeLogs(skuNos);
                }
                TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
                one.setTjLx(order.getTjCategory());
                LambdaQueryWrapper<TjAskHistorys> wqq111 = new LambdaQueryWrapper<>();
                wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
                final List<TjAskHistorys> list11 = historysService.list(wqq111);
                wqq111.eq(TjAskHistorys::getDataType,1);
                List<TjAskHistorys> list11 = historysService.list(wqq111);
                one.setTjAskHistorysList(list11);
                TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
                one.setTjLx(order.getTjCategory());
                wqq111 = new LambdaQueryWrapper<>();
                wqq111.eq(TjAskHistorys::getAskId, one.getAskId());
                wqq111.eq(TjAskHistorys::getDataType,2);
                list11 = historysService.list(wqq111);
                one.setZhiyezzList(list11);
                return AjaxResult.success(one);
            }else {
                TjAskMedicalHistory a = new TjAskMedicalHistory();
@@ -367,6 +378,7 @@
        return toAjax(historysService.removeByIds(historyId));
    }
    /**
     * 小程序根据客户身份证号获取问诊详细信息
     */
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1686,11 +1686,14 @@
                                            }
                                        } else {
                                            String[] split = tjOrderDetail.getProResult().split("[。,,::.\\s]+");
                                            String regex = configService.selectConfigByKey("jcycjgfgzz");
                                            if(StringUtil.isBlank(regex)) regex="。|;|;|,|,";
                                            String[] split = tjOrderDetail.getProResult().replaceAll("\n", "").split(regex);
                                            List<Map<String, Object>> mapList = new ArrayList<>();
                                            for (String s : split) {
                                                if(StringUtil.isNotBlank(s)){
                                                s = s.replaceAll("\n", "").replaceAll("[((][^))]*[))]", "").replaceAll(" ","")
                                                        .replaceAll("症","").replaceAll("[0-9]", "");
                                                            .replaceAll("[0-9]", "");
                                                Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb);
                                                if (null != maps && !maps.isEmpty()) {
                                                    Object bt = maps.get("bt");
@@ -1698,6 +1701,7 @@
                                                    if (null != bt || null != nr) mapList.add(maps);
                                                }
                                            }
                                            }
                                            tjOrderDetail.setAdvices(mapList);
                                        }
ltkj-admin/src/test/java/zjhTest.java
@@ -129,23 +129,22 @@
        public static void main(String[] args) {
//            BigDecimal ordPrice =new BigDecimal("13.05");
//            BigDecimal multiply = ordPrice.multiply((new BigDecimal("6.5").divide(BigDecimal.valueOf(10))));
//            System.out.println(multiply);
            String input = "1399168522"; // 输入字符串
            String input = "1.甲状腺双侧叶结节;体积增大,光点增粗,请结合临床2.双侧乳腺增生症3.右侧附件囊肿;盆腔少量积液";
            String s = "(\\d+[\\.、]\\s*)|[。]";
            System.out.println("jcycxmzz值为"+s);
            // 使用正则分割:匹配 1. 1、(后面可以有空格),或中文句号“。”
            String[] parts = input.split(s);
            boolean mobileNO = MatchUtils.isMobileNO(input);
            System.out.println(mobileNO); // 输出结果
            System.out.println(!mobileNO); // 输出结果
            if(!mobileNO){
                System.out.println(111);
            for (String part : parts) {
                String trimmed = part.trim();
                System.out.println(trimmed);
            }
            }
//            System.out.println(s);
    public static boolean isNumeric(String str) {
        return str != null && str.matches("\\d+");
        }
    /**
     * 执行生成
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
@@ -112,7 +112,7 @@
    List<Map<String ,Object >> getCusInfoListByCardAndName(@Param("card") String card,@Param("name") String name);
    @Select("SELECT IF(b.cus_sex=0,'男','女') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
    @Select("SELECT IF(b.cus_sex=0,'0','1') xb FROM tj_order a JOIN tj_customer b ON b.cus_id=a.user_id \n" +
            "WHERE a.tj_number=#{tjNumber}")
    String getSexByTjh(String tjNumber);
}
ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
@@ -67,9 +67,42 @@
        </resultMap>
    <sql id="selectTjAskMedicalHistoryVo">
        select ask_id, cus_id, cus_name, work, work_status, medical_history, chuchao, jingqi, zhouqi, mociage, zinv, liuchan,
               zaochan, sichan, yichangtai, xiyan, xiyanpinlv, xiyanyear, yinjiu, yinjiupinlv, yinjiuyear, qita, remark, create_by,
               create_time, update_by, update_time, deleted,from_by,zzsjj,contact_poison,gong_zhong,gong_ling,jhgl,
        select ask_id,
               cus_id,
               cus_name,
            work,
            work_status,
            medical_history_ids,
            medical_history,
            medical_history_other,
            chuchao,
            jingqi,
            zhouqi,
            mociage,
            zinv,
            liuchan,
            zaochan,
            sichan,
            yichangtai,
            xiyan,
            xiyanpinlv,
            xiyanyear,
            yinjiu,
            yinjiupinlv,
            yinjiuyear,
            qita,
            remark,
            create_by,
            create_time,
            update_by,
            update_time,
            deleted,
            from_by,
            zzsjj,
            contact_poison,
            gong_zhong,
            gong_ling,
            jhgl,
               dwmc,
               ygdw
        from tj_ask_medical_history