zjh 2024/02/20--1

zjh

2024-02-20 c4f1fcc51989a014f9737689c123b3266f13ccda

zjh 2024/02/20--1

 ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java

@@ -406,4 +406,19 @@
//        }
        return AjaxResult.success("同步成功");
    }



    @GetMapping("/getTjYxjcList")
    @ApiOperation(value = "查询影响检查项目")
    public AjaxResult getTjYxjcList() {
        List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList("杨云云",null,null,null);
        return AjaxResult.success(tjYxjcList);
    }






}

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

@@ -17,6 +17,7 @@
import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.system.domain.SysPost;
import com.ltkj.system.domain.SysUserPost;
@@ -98,6 +99,8 @@
    private ITjRulesService tjRulesService;
    @Autowired
    public RedisTemplate<Object,Object> redisTemplate;
    @Resource
    private TestMapper testMapper;


    /**
@@ -834,6 +837,33 @@
    }


    @GetMapping("/getTjYxjcList")
    @ApiOperation("查询个人影响检查项目结果集")
    public AjaxResult getTjYxjcList(@ApiParam(value = "姓名") @RequestParam String patname,
                                    @ApiParam(value = "性别") @RequestParam String sex,
                                    @ApiParam(value = "年龄") @RequestParam String patage,
                                    @ApiParam(value = "年龄单位") @RequestParam String patagename,
                                    @ApiParam(value = "生日)") @RequestParam Date patbirth) {

        String format = DateUtil.format(patbirth, "yyyy.MM.dd");

        List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,patage+patagename,format);
        return AjaxResult.success(tjYxjcList);
    }


//    @GetMapping("/getSsTjYxjcList")
//    @ApiOperation("查询个人影响检查项目结果集(搜素用)")
//    public AjaxResult getSsTjYxjcList(@ApiParam(value = "姓名") @RequestParam String patname,
//                                    @ApiParam(value = "性别") @RequestParam String sex,
//                                    @ApiParam(value = "年龄") @RequestParam String patage) {
//
//
//        List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null,null);
//        return AjaxResult.success(tjYxjcList);
//    }






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

@@ -77,51 +77,10 @@
        List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
        if (null != list && list.size() > 0) {
            for (TjPackage aPackage : list) {
//                StringBuilder allProName = new StringBuilder();
//                StringBuilder allSonName = new StringBuilder();
//
//                List<TjProject> tjProjectList = new ArrayList<>();
//                List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
//                if (null != pplist) {
//                    for (TjPackageProject packageProject : pplist) {
//                        StringBuilder allSonProName = new StringBuilder();   //2023.2.7 套餐内每一父项目的子项目字符串
//                        TjProject tjProject = tjProjectService.getById(packageProject.getProId());
//                        if (null != tjProject) {
//                            allProName.append(tjProject.getProName()).append("；");
//                            List<TjProject> listBySoneId = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
////                            for (TjProject project : listBySoneId) {
////                                allSonProName.append(project.getProName()).append(";");  //2023.2.7 套餐内每一父项目的子项目字符串
////                                allSonName.append(project.getProName()).append(";");
////                            }
//                            tjProject.setAllSonProName(allSonProName.toString());   //2023.2.7 套餐内每一父项目的子项目字符串
//                            tjProjectList.add(tjProject);
//                            //现价赋值判断null赋原价  2023.2.8
//                            if (packageProject.getPriceNow() != null) {
//                                tjProject.setPriceNow(packageProject.getPriceNow());
//                            } else {
//                                tjProject.setPriceNow(tjProject.getProPrice());
//                            }
//
//                        }
//                    }
//                }
//                aPackage.setTjProjectList(tjProjectList);
                aPackage.setAllProName(tjPackageService.getTjPacProNames(String.valueOf(aPackage.getPacId())));
//                aPackage.setAllSonName(allSonName.toString());

//                StringBuffer a = new StringBuffer();
//                List<String> b = new ArrayList<>();
                final String keywords = aPackage.getKeywords();
                if (keywords != null) {
                    final String[] strings = keywords.split(",");
//                    for (String string : strings) {
//                        final MallKeyword byId = mallKeywordService.getById(string);
//                        if (byId != null) {
//                            a.append(byId.getKeyword());
//                            a.append(";");
//                            b.add((byId.getId()).toString());
//                        }
//                    }
                    aPackage.setKeyNames(mallKeywordService.getKeyNames(strings));
                    aPackage.setKeyIds(mallKeywordService.getKeyIds(strings));
                }

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

@@ -187,4 +187,27 @@
    @Select("SELECT * FROM histjv_ltkj_userinfo")
    @DataSource(value = DataSourceType.SLAVE_HIS)
    public List<LtkjHisUser> getLtkjHisUser();


    @DataSource(value = DataSourceType.SLAVE_PACS)
    @Select({"<script> select bgid xh,patname pacName ,rptid  pacCode,patage+patagename+'['+sex+']'+patbirth detail,djrq+jcxm pacRemark,lxhd price \n" +
            "\tfrom V_HIS_PACS_SQ\n" +
            "\twhere 1=1 " +
            " <when test='patname!=null'>" +
            "  AND patname=#{patname}" +
            "</when>"+
            " <when test='sex!=null'>" +
            "  AND  sex=#{sex} "+
            "</when>"+
            " <when test='nn!=null'>" +
             " AND  patage+patagename=#{nn}" +
             "</when>"+
            " <when test='sr!=null'>" +
            "  AND  patbirth=#{sr}" +
            "</when>"+
            "</script>"})
    public List<Map<String,Object>> getTjYxjcList(@Param("patname")String patname,
                                                  @Param("sex")String sex,
                                                  @Param("nn")String nn,
                                                  @Param("sr")String sr);
}

 ltkj-hosp/src/main/java/com/ltkj/mall/mapper/MallKeywordMapper.java

@@ -66,14 +66,14 @@
    public int deleteMallKeywordByIds(Long[] ids);


    @Select({"<script>"," SELECT * FROM mall_keyword a WHERE a.id IN", "<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
    @Select({"<script>"," SELECT GROUP_CONCAT(a.keyword ORDER BY a.keyword) AS names FROM mall_keyword a WHERE a.id IN", "<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
            "#{id}",
            "</foreach>",
            "</script>" })
    String getKeyNames(@Param("ids")String[] ids);


    @Select({"<script>"," SELECT GROUP_CONCAT(a.keyword ORDER BY a.keyword) AS names FROM mall_keyword a WHERE a.id IN ", "<foreach collection='ids'" +
    @Select({"<script>"," SELECT a.id FROM mall_keyword a WHERE a.id IN ", "<foreach collection='ids'" +
            " item='id' open='(' separator=',' close=')'>",
            "#{id}",
            "</foreach>",