ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -7,7 +7,6 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.common.utils.SecurityUtils; import com.ltkj.hosp.domain.*; import com.ltkj.hosp.hisDto.*; import com.ltkj.hosp.service.*; @@ -88,10 +87,10 @@ String pationid = resultData.get("PationId").toString(); if (null != pationid) { customer.setPationId(pationid); // customerService.updateById(customer); /* OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto(); customerService.updateById(customer); OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto(); outpinregapplyDto.setPationid(pationid); outpinregapplyDto.setSqysbm(SecurityUtils.getUsername()); outpinregapplyDto.setSqysbm("00029"); outpinregapplyDto.setMzksbm("0101"); outpinregapplyDto.setCzybm("00029"); outpinregapplyDto.setSfjz("0"); @@ -110,16 +109,14 @@ Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0); String hisRegistrationId = resultDatasss.get("his_registration_id").toString(); //门诊医生接诊 controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername()); controller.Outpinconapply(hisRegistrationId, date,"00029"); customer.setCardId(hisRegistrationId); customerService.updateById(customer); transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(),hisRegistrationId); if(null !=tjOrder){ transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(),hisRegistrationId,tjOrder.getTjNumber()); tjOrder.setCardId(hisRegistrationId); orderService.updateById(tjOrder); } } }*/ AjaxResult error = tijianshenqing(customer, date); if (error != null) return error; return AjaxResult.success(); @@ -136,7 +133,7 @@ OutpintestapplyDto dto = new OutpintestapplyDto(); dto.setHisRegistrationId(customer.getCardId()); dto.setSfjz(customer.getCusIdcard()); dto.setSqysbm(SecurityUtils.getUsername()); dto.setSqysbm("00029"); dto.setMzksbm("0101"); dto.setSjrq(date); dto.setCzybm("00029"); @@ -231,7 +228,7 @@ OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto(); outpinexamapplyDto.setHisRegistrationId(customer.getCardId()); outpinexamapplyDto.setSfzh(customer.getCusIdcard()); outpinexamapplyDto.setSqysbm(SecurityUtils.getUsername()); outpinexamapplyDto.setSqysbm("00029"); outpinexamapplyDto.setMzksbm("0101"); outpinexamapplyDto.setCzybm("00029"); outpinexamapplyDto.setCzyksbm("0101"); @@ -326,7 +323,7 @@ OutpintreatapplyDto dao = new OutpintreatapplyDto(); dao.setHisRegistrationId(customer.getCardId()); dao.setSfzh(customer.getCusIdcard()); dao.setSqysbm(SecurityUtils.getUsername()); dao.setSqysbm("00029"); dao.setMzksbm("0101"); dao.setSjrq(date); dao.setCzybm("00029"); @@ -338,7 +335,7 @@ wq.in(TjProject::getProId, details.stream().map(TbTransition::getParentProId).collect(Collectors.toList())); wq.groupBy(TjProject::getHisXmbm); wq.in(TjProject::getDeptId, "100", "240", "253", "254", "255", "257", "258", "259", "269", "270"); wq.isNull(TjProject::getDeptId); // wq.isNull(TjProject::getDeptId); List<TjProject> projects = projectService.list(wq); if (null != projects && projects.size() > 0) { for (TjProject project : projects) { ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
@@ -506,7 +506,6 @@ // map.put ("pationid", pationid); // map.put ("pagecount", pagecount); // map.put ("page", page); String post = HttpClientUtils.sendPost (HIS_URL+"Getlabreportinfo", map); return AjaxResult.success ().put ("data", post); } @@ -669,6 +668,7 @@ return AjaxResult.success ().put ("data", post); } // @ApiOperation(value = "2.4.3 获取检验结果记录信息") public AjaxResult Getlabdetailinfo (Map<String ,Object> map) { String post = HttpClientUtils.sendPost (HIS_URL+"Getlabdetailinfo", map); return AjaxResult.success ().put ("data", post); ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1432,7 +1432,7 @@ HashMap<String, Object> hisRequestParams = new HashMap<>(); // 不在需要身份证号 // hisRequestParams.put("card_no",tjCustomer.getCusIdcard()); hisRequestParams.put("patientId",tjCustomer.getCardId()); hisRequestParams.put("patientId",tjOrder.getCardId()); AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams); if (Integer.parseInt(queryPay.get("code").toString()) == 200) { List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data"); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -2,6 +2,9 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; 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.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -25,9 +28,11 @@ import com.ltkj.system.service.ISysConfigService; import com.ltkj.system.service.ISysDeptService; import com.ltkj.system.service.ISysUserService; import com.ltkj.web.controller.his.HisApiMethodService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.var; import org.aspectj.weaver.AjAttribute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -95,6 +100,9 @@ private LtkjHybgdService ltkjHybgdService; @Resource private LtkjHysqdService ltkjHysqdService; @Autowired private HisApiMethodService controller; @GetMapping("/getOperationPermissionsByTjNum") @@ -311,11 +319,14 @@ public AjaxResult dataSynchronization(@RequestParam String tjNumber) { //根据配置调取存储过程 将临时表数据存入预约表2023.12.12 final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData"); if ("Y".equals(getInfoFromSqlData)) { final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis"); TjOrder order = orderService.getOrderByTjNum(tjNumber); if (null != order) { tbhyxm(order); //开启字典弹窗 if ("Y".equals(getInfoFromSqlData)) { tbhyxm(order); // List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber); // if (one2 != null && one2.size() > 0) { // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); @@ -335,9 +346,107 @@ //同步检查项目 testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId()); asyncService.updateCheckType(order.getTjNumber()); } //开启和his对接 if(null !=sfkqdyhis && sfkqdyhis.equals("Y")){ String baoGaoDan = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId()); if(null !=baoGaoDan){ Date dates = new Date(); Map<String,Object> map=new HashMap<>(); map.put("his_registration_id",order.getCardId()); map.put("ksbm",""); map.put("pationid",""); map.put("ksrq",DateUtil.format(DateUtil.beginOfDay(dates), "yyyy-MM-dd HH:mm:ss")); map.put("jsrq",DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss")); map.put("pagecount",10); map.put("page",1); AjaxResult result = controller.Getlabreportinfo(map); String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if(null ==code || !code.equals("0")){ return AjaxResult.error("化验项目暂时无结果,请稍后同步!!!"); } JSONArray data = object.getJSONArray("ResultData"); for (Object datum : data) { JSONObject jsonObject = (JSONObject)datum; LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID")); if(null !=jybgid){ continue; } LtkjHysqd hysqd=new LtkjHysqd(); hysqd.setTjh(order.getCardId()); hysqd.setTmh(jsonObject.getStr("JYBGID")); hysqd.setBbbh(jsonObject.getStr("BBDM")); hysqd.setBbmc(jsonObject.getStr("BBMC")); hysqd.setXmid(jsonObject.getStr("JYXMDM")); hysqd.setXmmc(jsonObject.getStr("JYXMMC")); hysqd.setSqsj(jsonObject.getStr("SQRQ")); hysqd.setSqys(jsonObject.getStr("SQRBH")); hysqd.setJgsj(jsonObject.getStr("JYBGRQ")); hysqd.setSqrxm(jsonObject.getStr("SQRXM")); hysqd.setSqdh(jsonObject.getStr("SQDBH")); if (ltkjHysqdService.save(hysqd)) { Map<String,Object> hashMap=new HashMap<>(); hashMap.put("jybgid",hysqd.getTmh()); AjaxResult bgdres = controller.Getlabdetailinfo(hashMap); String result2 = getAjaxResult(bgdres); JSONObject object1 = getJSONObject(result2); String code1 = object1.getStr("ResultCode"); if(null ==code1 || !code1.equals("0")){ return AjaxResult.error("化验项目暂时无结果,请稍后同步!!!"); } JSONArray datas = object1.getJSONArray("ResultData"); for (Object o : datas) { JSONObject js = (JSONObject)o; // ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jsonObject.getStr("JYBGID")); LtkjHybgd bgd=new LtkjHybgd(); bgd.setTmh(hysqd.getTmh()); bgd.setJcxmid(js.getStr("JCZBDM")); bgd.setJcxm(js.getStr("JCZBMC")); bgd.setTdh(js.getStr("")); bgd.setJyjg(js.getStr("JCZBJG")); bgd.setJgdw(js.getStr("JLDW")); bgd.setFwzdz(js.getStr("")); bgd.setFwzgz(js.getStr("")); bgd.setFwz(js.getStr("CKZFW")); bgd.setJysj(js.getStr("BGRQ")); bgd.setJyys(js.getStr("JCRBH")); bgd.setShsj(js.getStr("BGRQ")); bgd.setShsj(js.getStr("BGRQ")); bgd.setShys(js.getStr("SHRBH")); bgd.setYcbz(js.getStr("YCTS")); // bgd.setTpurl(js.getStr("")); ltkjHybgdService.save(bgd); } } } //同步化验项目 testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId()); //同步检查项目 testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId()); asyncService.updateCheckType(order.getTjNumber()); } } return AjaxResult.success("同步成功"); } return AjaxResult.error(); } //将方法返回值解析成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(); } private void tbhyxm(TjOrder order) { @@ -642,6 +751,8 @@ if (one == null) { return AjaxResult.error("暂无数据！！"); } final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData"); if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y")) tbhyxm(one); // TjCustomer customer = customerService.getById(one.getUserId()); List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanTable(tjNumber); @@ -650,7 +761,6 @@ if (null != remarkList && remarkList.size() > 0) { for (TjOrderRemark remark : remarkList) { Map<String, Object> parent = new HashMap<>(); parent.put("checkAdvice", one.getCheckAdvice()); parent.put("parent", remark.getProName()); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -211,11 +211,11 @@ // controller.Outpincreateapply(tjCustomer); Date dates = new Date(); /* Date dates = new Date(); final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss"); OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto(); outpinregapplyDto.setPationid(tjCustomerServiceOne.getPationId()); outpinregapplyDto.setSqysbm(SecurityUtils.getUsername()); outpinregapplyDto.setSqysbm("00029"); outpinregapplyDto.setMzksbm("0101"); outpinregapplyDto.setCzybm("00029"); outpinregapplyDto.setSfjz("0"); @@ -240,7 +240,7 @@ // tjCustomerService.updateById(tjCustomerServiceOne); tjCustomerService.updateCardId(tjCustomerServiceOne.getCusId(),hisRegistrationId); } } }*/ } //end====2023.12.12 @@ -507,12 +507,11 @@ if (null != resultData && resultData.size() > 0) { String pationid = resultData.get("PationId").toString(); if (null != pationid) { tjCustomer.setPationId(pationid); // tjCustomerService.updateById(tjCustomer); OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto(); tjCustomerService.updateById(tjCustomer); /* OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto(); outpinregapplyDto.setPationid(pationid); outpinregapplyDto.setSqysbm(SecurityUtils.getUsername()); outpinregapplyDto.setSqysbm("00029"); outpinregapplyDto.setMzksbm("0101"); outpinregapplyDto.setCzybm("00029"); outpinregapplyDto.setSfjz("0"); @@ -545,7 +544,7 @@ } } } } }*/ } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -418,8 +418,8 @@ continue; } ppservice.save(tjpp); if (null != tjProject.getPriceNow()) { money = money.add(tjProject.getPriceNow()); if (null != tjProject.getProPrice()) { money = money.add(tjProject.getProPrice()); } } tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price")))); @@ -465,8 +465,8 @@ tjpp.setProId(tjProject.getProId()); tjpp.setPacId(tjPackage.getPacId()); ppservice.save(tjpp); if (null != tjProject.getPriceNow()) { money = money.add(tjProject.getPriceNow()); if (null != tjProject.getProPrice()) { money = money.add(tjProject.getProPrice()); } } tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price")))); ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
@@ -7,6 +7,7 @@ import com.ltkj.hosp.sqlDomain.LtkjHybgd; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; /** * @Company: 西安路泰科技有限公司 @@ -20,4 +21,8 @@ @Delete("DELETE FROM ltkj_hybgd WHERE tmh=#{tmh} ") void deletedLtkjHybgdByTjhAndTmh(String tmh); @Select("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检验'") String getJianYanBaoGaoDan(String cardId); } ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -232,7 +232,7 @@ "a.card_id=#{cardId}\n" + "WHERE\n" + "\ta.cus_id =#{idCard}\n" + "\tAND ISNULL(a.tj_num)") boolean updateCardIdByTjNumAndIdCard(@Param("idCard")String idCard,@Param("cardId")String cardId); "\tAND a.tj_num = #{tjNumber}") boolean updateCardIdByTjNumAndIdCard(@Param("idCard")String idCard,@Param("cardId")String cardId,@Param("tjNumber") String tjNumber); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -116,5 +116,5 @@ String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId); boolean updateCardIdByTjNumAndIdCard(String idCard,String cardId); boolean updateCardIdByTjNumAndIdCard(String idCard,String cardId,String tjNumber); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
@@ -12,4 +12,6 @@ public interface LtkjHybgdService extends IService<LtkjHybgd> { void deletedLtkjHybgdByTjhAndTmh(String tmh); String getJianYanBaoGaoDan(String cardId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
@@ -26,4 +26,9 @@ public void deletedLtkjHybgdByTjhAndTmh(String tmh) { mapper.deletedLtkjHybgdByTjhAndTmh(tmh); } @Override public String getJianYanBaoGaoDan(String cardId) { return mapper.getJianYanBaoGaoDan(cardId); } } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -188,7 +188,7 @@ } @Override public boolean updateCardIdByTjNumAndIdCard(String idCard, String cardId) { return tbTransitionMapper.updateCardIdByTjNumAndIdCard(idCard,cardId); public boolean updateCardIdByTjNumAndIdCard(String idCard, String cardId,String tjNumber) { return tbTransitionMapper.updateCardIdByTjNumAndIdCard(idCard,cardId,tjNumber); } } ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjHysqd.java
@@ -31,4 +31,8 @@ private String sqys; @ApiModelProperty(value = "结果时间") private String jgsj; @ApiModelProperty(value = "申请单号") private String sqdh; @ApiModelProperty(value = "申请人姓名") private String sqrxm; }
