zjh 2024/07/11-1

zjh

2024-07-11 201e9ae76d2c8d6219ceabbf4e1ebb36fc2e7a06

zjh 2024/07/11-1

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

@@ -205,12 +205,12 @@
                        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);
                            detilsDto.setPcbm("06");
                            detilsDto.setSl("1");
                            detilsDto.setDj("60");
                            detilsDto.setDcjl("1");
                            detilsDto.setPj("60");
                            detilsDto.setJj("60");
                            outpinmedicapplyDetilsDtos.add(detilsDto);
                        }
                    }
@@ -276,6 +276,8 @@
            dto1.setSjrq(date);
            dto1.setCzybm("00029");
            dto1.setCzyksbm("0101");
            dto1.setCflxbm("A");
            dto1.setYfbm("1");
            dto1.setDetails(outpinmedicapplyDetilsDtos);
            AjaxResult result = controller.Outpinmedicapply(dto1);
            String result1 = getAjaxResult(result);

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

@@ -331,7 +331,7 @@
    public AjaxResult Outpinmedicapply (OutpinmedicapplyDto dao) {
        Map<String, Object> map = new HashMap<> ();
        map.put ("his_registration_id", dao.getHisRegistrationId ());
        map.put ("sfzh", dao.getHisRegistrationId ());
        map.put ("sfzh", dao.getSfzh ());
        map.put ("sqysbm", dao.getSqysbm ());
        map.put ("mzksbm", dao.getMzksbm ());
        map.put ("sjrq", dao.getSjrq ());
@@ -339,8 +339,8 @@
        map.put ("czyksbm", dao.getCzyksbm ());
        map.put ("cflxbm", dao.getCflxbm ());
        map.put ("yfbm", dao.getYfbm ());
        map.put ("fyts", dao.getFyts ());
        map.put ("mzzd", dao.getMzzd ());
        map.put ("fyts","1");
        map.put ("mzzd","");
        map.put ("details", dao.getDetails ());
        String post = HttpClientUtils.sendPost (HIS_URL+"Outpinmedicapply", map);
        return AjaxResult.success ().put ("data", post);

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -124,6 +124,8 @@
    private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
    @Autowired
    private TjProBlService blService;
    @Resource
    private ITjFlowingWaterService tjFlowingWaterService;
    @Override
    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        long l = System.currentTimeMillis();
@@ -501,6 +503,9 @@

        String jxbz = DateUtil.format(dates, "yyyyMMddHHmmss")+order.getOrderId();

        tjFlowingWater.setJxbz(jxbz);
        tjFlowingWaterService.updateById(tjFlowingWater);

        TjProBl proBl=new TjProBl();
        proBl.setTjh(order.getTjNumber());
        proBl.setBldh(jxbz);

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

@@ -511,9 +511,13 @@
                                if(null !=objectMap.get("YXZD") || !objectMap.get("YXZD").equals(""))
                                jcbgd.setYxzd(objectMap.get("YXZD").toString());

                                if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals(""))
                                if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals("")){
                                    if(objectMap.get("YXBX").toString().equals("null")){
                                        jcbgd.setYxbx("未检异常");
                                    }else {
                                jcbgd.setYxbx(objectMap.get("YXBX").toString());

                                    }
                                }
                                if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
                                jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());


 ltkj-admin/src/main/resources/application.yml

@@ -4,4 +4,4 @@
#test 泾川县部署测试环境使用
spring:
  profiles:
    active: dev
    active: prod

 ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java

@@ -8,17 +8,17 @@

    private String ypbm;
    private String pcbm;
    private Integer zh;
    private Integer dcjl;
    private String zh;
    private String dcjl;
    private String jldw;
    private String tjbm;
    private String ps;
    private String psbm;
    private Integer sl;
    private Integer yyts;
    private Integer pj;
    private Integer jj;
    private Integer dj;
    private String sl;
    private String yyts;
    private String pj;
    private String jj;
    private String dj;
    private String xtph;
    private String scph;
    private String ypxq;
@@ -26,5 +26,5 @@
    private String kfdw;
    private String yfdw;
    private String yysm;
    private Integer fzbl;
    private String fzbl;
}