zjh
2024-07-10 02fc34a5283d43cf0aef9265123cf2f2dfac10a0
zjh 2024/07/10-1
7个文件已修改
4个文件已添加
246 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java 86 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-test.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -59,6 +59,8 @@
    private LtkjMxjfxmzdService ltkjMxjfxmzdService;
    @Autowired
    private LtkjEjjfxmzdService ltkjEjjfxmzdService;
    @Autowired
    private TjCfService cfService;
    //将方法返回值解析成json格式
    public JSONObject getJSONObject(String builder) {
@@ -179,6 +181,7 @@
        dto.setSfjz("0");
        List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
        List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
        List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
        if (null != detailList && detailList.size() > 0) {
            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
            wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
@@ -198,6 +201,17 @@
                            }
                            detailsDto.setSl(project.getSl());
                            detailsDtos.add(detailsDto);
                        }
                        if(project.getProId()==1740177341251154377L){
                            OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                            detilsDto.setYpbm("00006670");
                            detilsDto.setPcbm("1");
                            detilsDto.setSl(1);
                            detilsDto.setDj(60);
                            detilsDto.setDcjl(1);
                            detilsDto.setPj(60);
                            detilsDto.setJj(60);
                            outpinmedicapplyDetilsDtos.add(detilsDto);
                        }
                    }
                }
@@ -249,18 +263,50 @@
                    }
                    ltkjJianchajianyanTreeService.save(tree);
                }
//                Map<String, Object> datas = object3.getJSONObject("ResultData");
//                datas.put("cardId", customer.getCardId());
//                JSONObject object4 = JSONUtil.parseObj(datas);
//                LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
//                lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintestapply");
//                HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
//                hisApiGetMethodService.save(object4, "Outpintestapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dto)));
            }
//            else {
//                return AjaxResult.error("检验申请失败!");
//            }
        }
        //药品申请
        if(outpinmedicapplyDetilsDtos.size()>0){
            OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
            dto1.setHisRegistrationId(customer.getCardId());
            dto1.setSfzh(customer.getCusIdcard());
            dto1.setSqysbm("00029");
            dto1.setMzksbm("0101");
            dto1.setSjrq(date);
            dto1.setCzybm("00029");
            dto1.setCzyksbm("0101");
            dto1.setDetails(outpinmedicapplyDetilsDtos);
            AjaxResult result = controller.Outpinmedicapply(dto1);
            String result1 = getAjaxResult(result);
            JSONObject object = getJSONObject(result1);
            String code = object.getStr("ResultCode");
            if(null !=code && code.equals("200")){
                JSONArray resultData = object.getJSONArray("ResultData");
                Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
                String cfh = resultDatasss.get("cfh").toString();
                for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
                    TjCf cf=new TjCf();
                    cf.setCardId(customer.getCardId());
                    cf.setSfzh(customer.getCusIdcard());
                    cf.setCfh(cfh);
                    cf.setSqysbm("00029");
                    cf.setSqysxm("王健萍");
                    cf.setMzksbn("0101");
                    cf.setSqrq(date);
                    cf.setCzybm("00029");
                    cf.setYpbm(detilsDto.getYpbm());
                    cf.setYpmc("尿素[14C]呼气试验药盒");
                    cf.setSl(String.valueOf(detilsDto.getSl()));
                    cf.setDj(String.valueOf(detilsDto.getDj()));
                    cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
                    cf.setPj(String.valueOf(detilsDto.getPj()));
                    cf.setJj(String.valueOf(detilsDto.getJj()));
                    cf.setCreateTime(new Date());
                    cfService.save(cf);
                }
            }
        }
        //门诊检查申请
@@ -472,6 +518,9 @@
        List<String> zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId());
        List<String> cfhs = cfService.getCfhs(order.getCardId());
        //2.1.6.5 作废门诊检查申请
        if (null != jcsqdh && jcsqdh.size()>0) {
            for (String s : jcsqdh) {
@@ -524,6 +573,21 @@
//                }
            }
        }
        //作废药品申请
        if(null !=cfhs && cfhs.size()>0){
            for (String cfh : cfhs) {
                AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh);
                String result1 = getAjaxResult(result);
                JSONObject object = getJSONObject(result1);
                String code = object.getStr("ResultCode");
                if(null !=code && code.equals("200")){
                    cfService.delCfByCardId(cfh);
                }
            }
        }
        //2.1.3 门诊医生取消接诊
        ajaxResult = controller.Outpinunconapply(order.getCardId(), date, "00029");
        result2 = getAjaxResult(ajaxResult);
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -517,6 +517,12 @@
                                if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
                                jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());
                                if(null !=objectMap.get("JCBW") || !objectMap.get("JCBW").equals(""))
                                    jcbgd.setJcbw(objectMap.get("JCBW").toString());
                                if(null !=objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
                                    jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
                                jcbgdService.save(jcbgd);
                            }
                            jcsqdService.saveLtkjExamJcsqd(order.getCardId());
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -48,6 +48,7 @@
import com.ltkj.hosp.dto.QianDaoDto;
import com.ltkj.hosp.dto.TjProBlDto;
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
@@ -197,6 +198,20 @@
    private TjProBlService blService;
    @Autowired
    private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
    @Autowired
    private TjCfService cfService;
    //将方法返回值解析成json格式
    public JSONObject getJSONObject(String builder) {
        String Response = JSONUtil.parseObj(builder).getStr("Response");
        return JSONUtil.parseObj(Response);
    }
    //获取方法返回值信息
    public String getAjaxResult(AjaxResult result) {
        return result.get("data").toString();
    }
    /**
     * 查询体检记录列表
@@ -2830,5 +2845,28 @@
        }
        return AjaxResult.error();
    }
    @PostMapping("/addYaoPinShenQing")
    @ApiOperation(value = "药品信息申请")
    @Transactional
    public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto){
        AjaxResult result = controller.Outpinmedicapply(dto);
        String result1 = getAjaxResult(result);
        JSONObject object = getJSONObject(result1);
        String code = object.getStr("ResultCode");
        if(null !=code && code.equals("200")){
        }
        return AjaxResult.success();
    }
}
ltkj-admin/src/main/resources/application-test.yml
@@ -238,5 +238,5 @@
#  username = root
#  password = Root_ltkj123
config:
  properties: D:\ltkjprojectconf\config.properties1
  properties: D:\ltkjprojectconf\config1.properties
  path: D:\ltkjprojectconf
ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
@@ -89,6 +89,7 @@
                    fileWriter.write("password = 你的主数据库连接密码\n");
                    fileWriter.write("redisIp = 你的redisIp地址");
                    fileWriter.write("redisProt = 你的redis端口");
                    fileWriter.write("redisIpDatabase = 你的redis链接库");
                    fileWriter.write("redisPassword = 你的redis密码");
                    fileWriter.write("");
                    fileWriter.close();
@@ -109,7 +110,7 @@
            // 如果需要密码验证,设置密码
            factory.setPassword(props.getProperty("redisPassword"));
            // 设置其他参数,如数据库索引等
            factory.setDatabase(0);
            factory.setDatabase(Integer.parseInt(props.getProperty("redisIpDatabase")));
            // 最后,初始化连接
            factory.afterPropertiesSet();
            log.info("redis连接成功!!!");
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCf.java
New file
@@ -0,0 +1,36 @@
package com.ltkj.hosp.domain;/*
 * @Authot:zjh
 * @Date:  2024-07-10   15:43
 * */
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.util.Date;
@Data
public class TjCf {
    @TableId(type = IdType.AUTO)
    private Long id;
    private String cardId;
    private String sfzh;
    private String cfh;
    private String sqysbm;
    private String sqysxm;
    private String mzksbn;
    private String sqrq;
    private String czybm;
    private String czyxm;
    private String czksbm;
    private String ypbm;
    private String ypmc;
    private String pcbm;
    private String sl;
    private String dj;
    private String dcjl;
    private String pj;
    private String jj;
    private Date createTime;
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -32,6 +32,6 @@
    @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" +
            "a.yxzd jgzt,a.yxbx jgbx\n" +
            "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.tmh")
            "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
    void saveLtkjExamJcsqd(String tjh);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCfMapper.java
New file
@@ -0,0 +1,24 @@
package com.ltkj.hosp.mapper;/*
 * @Authot:zjh
 * @Date:  2024-07-10   15:45
 * */
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjCf;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import javax.annotation.Resource;
import java.util.List;
@Mapper
public interface TjCfMapper extends BaseMapper<TjCf> {
    @Delete("DELETE FROM tj_cf WHERE cfh=#{cfh}")
    void  delCfByCardId(String cfh);
    @Select("SELECT a.cfh FROM tj_cf a WHERE a.card_id=#{cardId}")
    List<String> getCfhs(String cardId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjCfService.java
New file
@@ -0,0 +1,17 @@
package com.ltkj.hosp.service;/*
 * @Authot:zjh
 * @Date:  2024-07-10   15:46
 * */
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjCf;
import java.util.List;
public interface TjCfService extends IService<TjCf> {
    void  delCfByCardId(String cfh);
    List<String> getCfhs(String cardId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCfServiceImpl.java
New file
@@ -0,0 +1,30 @@
package com.ltkj.hosp.service.impl;/*
 * @Authot:zjh
 * @Date:  2024-07-10   15:47
 * */
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.TjCf;
import com.ltkj.hosp.mapper.TjCfMapper;
import com.ltkj.hosp.service.TjCfService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class TjCfServiceImpl extends ServiceImpl<TjCfMapper, TjCf> implements TjCfService {
    @Resource
    private TjCfMapper mapper;
    @Override
    public void delCfByCardId(String cfh) {
        mapper.delCfByCardId(cfh);
    }
    @Override
    public List<String> getCfhs(String cardId) {
        return mapper.getCfhs(cardId);
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java
@@ -29,4 +29,6 @@
    private String yxzd;
    private String yxbx;
    private String zdsj;
    private String sqsj;
    private String jcbw;
}