ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java

@@ -16,6 +16,7 @@
import com.ltkj.common.utils.SnowFlake;
import com.ltkj.common.utils.uuid.UUID;
import com.ltkj.hosp.domain.SysAttachment;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.ISysAttachmentService;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDictDataService;
@@ -70,6 +71,8 @@
    private ISysDictDataService sysDictDataService;
    @Autowired
    private ISysConfigService sysConfigService;
    @Autowired
    private TestMapper testMapper;


    /**
@@ -151,6 +154,13 @@
        }
    }

    /**
     * exe上传图片接口
     * @param file
     * @param dictVal
     * @param ip
     * @return
     */
    @PostMapping("/uploadImgExe")
    @ApiOperation(value = "EXE程序循环读取图片上传")
    public AjaxResult uploadImgExe(@RequestPart("file") MultipartFile file,@RequestParam("val")String dictVal,@RequestParam("ip")String ip){
@@ -197,6 +207,18 @@
        }
    }

    /**
     * 获取exe程序上传图片列表
     * @param type
     * @return
     */
    @GetMapping("/getExeUploadImgList")
    public AjaxResult getExeUploadImgList(@RequestParam("type") String type){
        if (StrUtil.isBlank(type)) return AjaxResult.error("类型不能为空");
        List<Map<String, Object>> list = testMapper.getExeUploadImgListByGnLx(type);
        return AjaxResult.success().put("data",list);
    }

    @GetMapping("/listExeVal")
    public AjaxResult listExeDictVal(){
        LambdaQueryWrapper<SysDictData> queryWrapper = new LambdaQueryWrapper<>();

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

@@ -1866,7 +1866,7 @@
                                paragraph.setLeading(5f);
                                document1.add(ppp);
                                if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
@@ -1931,7 +1931,7 @@
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                    if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
@@ -2054,7 +2054,7 @@
                                paragraph.setLeading(5f);
                                document1.add(ppp);
                                if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                    ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
@@ -2073,16 +2073,32 @@
                            if (isPacs) {
                                Paragraph pp;
                                Paragraph ppp;
                                if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
                                    pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                    document1.add(pp);
                                    ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                String key = sysConfigService.selectConfigByKey("makepdfuseorderdetailproresult");
                                if (StrUtil.isNotBlank(key) && !key.equals("Y")){
                                    if (StrUtil.isNotBlank(value.get(0).getSj())) {
                                        pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                        document1.add(pp);
                                        ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
                                    }
                                }else {
                                    if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
                                        pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                        document1.add(pp);
                                        ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);
                                    }
                                }
                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示："+ (value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()));
                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示：");
                                document1.add(pp);
                                ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()), remarkFonts);
                                paragraph.setAlignment(Element.ALIGN_LEFT);
                                paragraph.setLeading(5f);
                                document1.add(ppp);
//                                ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
//                                paragraph.setAlignment(Element.ALIGN_LEFT);
//                                paragraph.setLeading(5f);
@@ -2120,7 +2136,7 @@
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                    if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark(), remarkFonts);
                                        ppp = new Paragraph("结论：" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
                                        paragraph.setAlignment(Element.ALIGN_LEFT);
                                        paragraph.setLeading(5f);
                                        document1.add(ppp);

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

@@ -568,11 +568,19 @@
            return tjCustomer;
        }else {
            HashMap<String, Object> map = new HashMap<>();
            map.put("cardId","");
            // 1是身份证
            // 根据凌云his接口只要不是国内身份证号 身份证字段不传 将号码传递到卡号字段并单位编号必填 单位编号随便写
            if (!tjCustomer.getIdType().equals("1")){
                map.put("cardId",tjCustomer.getCusIdcard());
                map.put("compId",tjCustomer.getCusIdcard());
                map.put("cusIdCard", "");
            }else {
                map.put("cardId","");
                map.put("cusIdCard", tjCustomer.getCusIdcard());
                map.put("compId","");
            }
            map.put("cusName", tjCustomer.getCusName());
            map.put("cusSex", tjCustomer.getCusSex());
            map.put("cusIdCard", tjCustomer.getCusIdcard());
            map.put("compId","");
            map.put("cusBrithday", tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
            map.put("cusAddr", tjCustomer.getCusAddr());
            map.put("cusPhone", tjCustomer.getCusPhone());

 ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java

@@ -112,7 +112,7 @@
                        "/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/config/gxxmpym","/system/report/savePdf",
                        "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs","/check/ceshicc"
                        ,"/system/report/xiugaidayinzhuangtai","/system/config/ceshitijianhao").permitAll()
                .antMatchers("/common/uploadImgExe","/common/listExeVal","/pacs/InvokeRisService/**","/profileupload/**").permitAll()
                .antMatchers("/common/uploadImgExe","/common/listExeVal","/pacs/InvokeRisService/**","/profileupload/**","/common/getExeUploadImgList").permitAll()
                .antMatchers("/check/dataSynchronizationApi","/reservation/reservation/linkage").permitAll()
                // 静态资源，可匿名访问
                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()

 ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java

@@ -25,7 +25,8 @@
                        "/callBack/**",
                        "/hosp/order/signOrderInfo",
                        "/common/listExeVal",
                        "/profileupload/**"
                        "/profileupload/**",
                        "/common/getExeUploadImgList"
                });
    }
}

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

@@ -452,4 +452,7 @@
    @DataSource(value = DataSourceType.MASTER)
    @Select("call tj_bingzhongtongji(#{p_start,mode=IN},#{p_end,mode=IN})")
    List<Map<String ,Object>> getBingZhongInfo(@Param("p_start") String start,@Param("p_end") String end);

    @Select("select * from v_gnkssctp where gnlx=#{gnlx}")
    List<Map<String ,Object>> getExeUploadImgListByGnLx(@Param("gnlx") String gnlx);
}