From b6ec9700dda9dfa2530ddd9aac3c992acd9e5af2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期日, 01 十二月 2024 21:32:56 +0800
Subject: [PATCH] zjh20241201-1
---
ltkj-admin/src/main/resources/application-linux-prod.yml | 8 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 115 ++++++++++++++++++++++++++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 17 ++++
ltkj-admin/src/main/resources/logback.xml | 2
ltkj-admin/src/main/resources/application.yml | 1
ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java | 5
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 6 +
ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java | 3
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 25 ++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 8 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 15 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 6 +
15 files changed, 193 insertions(+), 28 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java b/ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java
index d939d7e..99a95ec 100644
--- a/ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java
+++ b/ltkj-admin/src/main/java/com/ltkj/LtkjApplication.java
@@ -1,5 +1,6 @@
package com.ltkj;
+import cn.hutool.crypto.SecureUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -32,5 +33,7 @@
" 鈻堚枅 鈻堚枅 鈻堚枅 鈻堚枅 鈻堚枅\n" +
" 鈻堚枅 鈻堚枅 鈻堚枅 鈻堚枅 鈻堚枅 鈻堚枅\n" +
" 鈻堚枅鈻堚枅鈻堚枅鈻堚枅 鈻堚枅 鈻堚枅 鈻堚枅 鈻堚枅鈻堚枅鈻堚枅\n");
+ //linux瑙ｅ喅hutll鏉冮檺鎶ラ敊鐨勯棶棰�
+ SecureUtil.disableBouncyCastle();
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 1315849..2a6a257 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -827,12 +827,13 @@
* @param customer
*/
private void notHuaYanData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
- LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
- wqq.ne(TjOrderRemark::getDeptId, "241");
- wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257");
- wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
- List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+// LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
+// wqq.ne(TjOrderRemark::getDeptId, "241");
+// wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257");
+// wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
+// List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+ List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark, null);
}
@@ -1064,7 +1065,7 @@
table1.setSpacingAfter(10f);
Font titleFont = PdfUtils.setFont(12);
- PdfPCell mergedCell = new PdfPCell(new Phrase("娉� 宸� 鍘� 浜� 姘� 鍖� 闄�", titleFont));
+ PdfPCell mergedCell = new PdfPCell(new Phrase("闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌", titleFont));
mergedCell.setBorder(Rectangle.NO_BORDER);
mergedCell.setColspan(10);
mergedCell.setHorizontalAlignment(Element.ALIGN_CENTER);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index 3d55962..d209771 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -8,10 +8,13 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
import com.ltkj.common.core.domain.entity.SysMenu;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.hosp.domain.DictHosp;
+import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.service.IDictHospService;
+import com.ltkj.hosp.service.ITjProjectService;
import com.ltkj.system.service.ISysMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -47,6 +50,8 @@
private IDictHospService dictHospService;
@Value ("${token.secret_key}")
private String secret;
+ @Autowired
+ private ITjProjectService projectService;
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
@@ -159,7 +164,8 @@
}
- @GetMapping ("/zx")//鎵ц
+ @GetMapping ("/zxsq")//鎵ц
+ @ApiOperation(value = "zxsq")
public AjaxResult zx(@RequestParam int day) {
try {
List<DictHosp> list = dictHospService.list();
@@ -179,6 +185,23 @@
}
+ @GetMapping ("/gxxmpym")//鎵ц
+ @ApiOperation(value = "涓�閿悓姝ユ洿鏂伴」鐩嫾闊崇爜")
+ public AjaxResult gxxmpym() {
+ try {
+ List<TjProject> list = projectService.list();
+ for (TjProject project : list) {
+ project.setProEngName(PinyinUtil.getFirstLetter(project.getProName(),""));
+ projectService.updateById(project);
+ }
+ return AjaxResult.success();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return AjaxResult.error();
+ }
+
+
@GetMapping ("/tbhisproprice")//鍚屾his椤圭洰鍗曚环淇℃伅
@PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')")
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 968a99b..328415d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -138,6 +138,17 @@
}
+
+ @GetMapping ("/ceshi")
+ @ApiOperation (value = "娴嬭瘯璋冪敤lis瑙嗗浘鏁版嵁鎺ュ彛")
+ @RepeatSubmit
+// @Transactional
+ public AjaxResult ceshi() {
+ List<Map<String, Object>> ccXZxYyLisJgSt = testMapper.getCcXZxYyLisJgSt();
+ return AjaxResult.success(ccXZxYyLisJgSt);
+ }
+
+
@GetMapping ("/getCsList")
@ApiOperation (value = "鍒濆鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
@Transactional
@@ -348,6 +359,7 @@
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
+ final String sfkqdshitulianjie = configService.selectConfigByKey("sfkqdshitulianjie");
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
@@ -601,6 +613,9 @@
//鍚屾妫�鏌ラ」鐩粰redis缂撳瓨鐜板湪涓嶇敤浜�
// asyncService.updateCheckType(order.getTjNumber());
}
+// else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
+// List<Map<String,Object>> maps= testMapper.getCcXZxYyLisJgSt();
+// }
//鍖栭獙
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
//妫�鏌�
@@ -618,6 +633,8 @@
}
}
+
+
/**
* 鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛
*/
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 3656f9b..db6983c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -23,6 +23,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
@@ -43,10 +44,7 @@
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
-import com.ltkj.common.utils.AgeResult;
-import com.ltkj.common.utils.DateUtils;
-import com.ltkj.common.utils.PDFDocumentUtil;
-import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.common.utils.*;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.config.ThreadPoolConfig;
import com.ltkj.framework.config.UserHoder;
@@ -74,10 +72,7 @@
import com.ltkj.mall.service.IMallCheckLogService;
import com.ltkj.mall.service.IMallOrderService;
import com.ltkj.system.domain.TjDjdDyjl;
-import com.ltkj.system.service.ISysConfigService;
-import com.ltkj.system.service.ISysDeptService;
-import com.ltkj.system.service.ISysUserService;
-import com.ltkj.system.service.ITjDjdDyjlService;
+import com.ltkj.system.service.*;
import com.ltkj.web.controller.his.*;
import com.ltkj.web.controller.lis.LisApiMethod;
import com.ltkj.web.controller.pacs.PacsApiMethodService;
@@ -223,7 +218,14 @@
private ITjGroupingProService groupingProService;
@Autowired
private ITjDjdDyjlService djdDyjlService;
-
+ @Autowired
+ private IdUtils idUtils;
+ @Autowired
+ private LtkjJybbzdService jybbzdService;
+ @Autowired
+ private LisJyflhbService lisJyflhbService;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
String Response = JSONUtil.parseObj(builder).getStr("Response");
@@ -1008,7 +1010,9 @@
//鐢熸垚浣撴鍙�
String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
tjOrder.setTjNumber(tjNumber);
+ BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
+ tjOrder.setDiscount(discount.toString());
if (tjOrderService.save(tjOrder)) {
//淇濆瓨鏀惰揣鍦板潃
if ("2".equals(tjOrder.getGetType())) {
@@ -1021,7 +1025,6 @@
Long cusNumber = tjCustomer.getCusNumber();
cusNumber += 1;
tjCustomer.setCusNumber(cusNumber);
- BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
@@ -1141,13 +1144,105 @@
if ("2".equals(tjOrder.getTjType())) {
//asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser,null);
}
+ // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
+ if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+// AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
+// if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser,null);
+
+ }
+
return AjaxResult.success(tjNumber);
}
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error();
}
+ public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
+ if (null != detailList && detailList1) {
+ Date date = new Date();
+ String format = DateUtil.format(date, "yyMMddHHmmssSSS");
+ for (TjOrderDetail detail : detailList) {
+ TjSampling sampling = new TjSampling();
+ if (null == projectService.getById(detail.getProId())) continue;
+ TjProject project = projectService.getById(detail.getProId());
+ Long proParentId = project.getProParentId();
+ String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType());
+ if (null != proParentId && proParentId == 0) {
+ sampling.setJyxh(idUtils.generateLisID());
+ sampling.setSpecimenTypeCode(project.getSpecimenType());
+ sampling.setSpecimenType(dictLabel);
+ sampling.setJyxmdm(project.getProId().toString());
+ } else {
+ TjProject project1 = projectService.getById(proParentId);
+ sampling.setJyxh(idUtils.generateLisID());
+
+ sampling.setSpecimenTypeCode(project1.getSpecimenType());
+ sampling.setSpecimenType(dictLabel);
+ sampling.setJyxmdm(project.getProId().toString());
+
+ }
+ sampling.setSamplingNumber(format);
+ sampling.setTjNum(order.getTjNumber());
+ sampling.setCusId(String.valueOf(order.getUserId()));
+ if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) {
+ sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName());
+ }
+ sampling.setApplicationTime(date);
+ sampling.setTjTime(order.getCreateTime());
+ sampling.setProId(String.valueOf(detail.getProId()));
+ sampling.setProName(projectService.getById(detail.getProId()).getProName());
+ sampling.setCreateBy(sysUser.getNickName());
+ sampling.setCreateTime(date);
+ sampling.setUpdateBy(sysUser.getNickName());
+ sampling.setUpdateTime(date);
+ sampling.setCreateId(String.valueOf(sysUser.getUserId()));
+ sampling.setUpdateId(String.valueOf(sysUser.getUserId()));
+ sampling.setJxbz(jxbz);
+ samplingService.save(sampling);
+ }
+ }
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
+ AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
+ if (ajaxResult.get("code").toString().equals("200")){
+ String str = ajaxResult.get("data").toString();
+ str = str.replace("=", ":");
+ JSONArray array = JSONUtil.parseArray(str);
+ for (Object o : array) {
+ JSONObject object = (JSONObject) o;
+ LisJyflhb lisJyflhb = new LisJyflhb();
+ lisJyflhb.setHbhxm(object.getStr("hbhxm"));
+ lisJyflhb.setFlmc(object.getStr("flmc"));
+ lisJyflhb.setMc(object.getStr("mc"));
+ lisJyflhb.setFlbm(object.getStr("flbm"));
+ LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm());
+ LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
+ if (jyflhb == null) {
+ lisJyflhb.setId(IdUtil.getSnowflake().nextId());
+ lisJyflhbService.save(lisJyflhb);
+ }else {
+ lisJyflhb.setId(jyflhb.getId());
+ lisJyflhbService.updateById(lisJyflhb);
+ }
+ }
+ }
+
+ }
+ }
+
+
@PostMapping("/addPlOrderAndDetail")
@ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
diff --git a/ltkj-admin/src/main/resources/application-linux-prod.yml b/ltkj-admin/src/main/resources/application-linux-prod.yml
index 5194c30..31f299a 100644
--- a/ltkj-admin/src/main/resources/application-linux-prod.yml
+++ b/ltkj-admin/src/main/resources/application-linux-prod.yml
@@ -189,13 +189,13 @@
# 浣撴鎶ュ憡妯℃澘鍜屾姤鍛婁复鏃剁敓鎴愬瓨鍌ㄧ殑鏂囦欢澶硅矾寰�
path:
- filePath: D:\Tjreport
+ filePath: /ltkj/Tjreport
# nginx鍥剧墖鏈嶅姟鍣�
reportServer: https://ltpeis.xaltjdkj.cn:5516/
# 浣撴濂楅鍜岃疆鎾浘瀛樺偍璺緞
-photoPath: D:\AppPhoto\uploadPath\
+photoPath: /ltkj/uploadPath/
# nginx鍥剧墖鏈嶅姟鍣�
#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
photoServer: http://192.168.0.5:5502/uploadPath/
@@ -251,5 +251,5 @@
# username = root
# password = Root_ltkj123
config:
- properties: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkj_peis/ltkj-admin/src/main/resources/config-prod.properties
- path: /Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/ltkj_peis/ltkj-admin/src/main/resources
+ properties: /ltkj/ltkjprojectconf/config.properties
+ path: /ltkj/ltkjprojectconf
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 074b323..86fc6e6 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -2,6 +2,7 @@
#dev 鍏徃 寮�鍙�/閮ㄧ讲浣跨敤
#prod 娉惧窛鍘块儴缃叉寮忕幆澧冧娇鐢�(灏忕▼搴忕涔熷彲浣跨敤)
#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
+# linux-prod
spring:
profiles:
active: dev
\ No newline at end of file
diff --git a/ltkj-admin/src/main/resources/logback.xml b/ltkj-admin/src/main/resources/logback.xml
index 1f37788..ee8ce19 100644
--- a/ltkj-admin/src/main/resources/logback.xml
+++ b/ltkj-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="logs"/>
+ <property name="log.path" value="/ltkj/jar/logs"/>
<!-- 鏃ュ織杈撳嚭鏍煎紡 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
index f93908e..9282963 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
@@ -182,9 +182,8 @@
Properties properties = new Properties();
// 杩欓噷鏄祴璇曞啓娉曪紝鍏蜂綋鐨剉alue鍙互閫氳繃璇锋眰鍙傛暟浼犻�掕繃鏉�
properties.setProperty("druid.enabled",props.getProperty("lisenabled"));
- properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
- properties.setProperty("druid.url","jdbc:sqlserver://"+props.getProperty("lisip")+":"+props.getProperty("lisprot")+";DatabaseName="+props.getProperty("lisname")+
- ";&characterEncoding=utf8");
+ properties.setProperty("druid.url","jdbc:mysql://"+props.getProperty("lisip")+":"+props.getProperty("lisprot")+"/"+props.getProperty("lisname")+"" +
+ "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8");
properties.setProperty("druid.username",props.getProperty("lisusername"));
properties.setProperty("druid.password",props.getProperty("lispassword"));
dataSource.restart(properties);
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
index 1a427d4..98d5044 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -109,8 +109,8 @@
.authorizeRequests()
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
.antMatchers("/login", "/register", "/captchaImage","/cus/**","/getCaptchaConfigKey","/report/jmreport/**",
- "/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/report/savePdf",
- "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl").permitAll()
+ "/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/config/gxxmpym","/system/report/savePdf",
+ "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi").permitAll()
.antMatchers("/common/uploadImgExe","/common/listExeVal").permitAll()
.antMatchers("/check/dataSynchronizationApi").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index 736ac59..f2c3481 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -439,6 +439,9 @@
@ApiModelProperty("棰勭害鍙�")
private String reservationId;
+ @ApiModelProperty(value = "鎶樻墸")
+ private String discount;
+
@TableField(exist = false)
private Integer dycs;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index 3465685..1971cac 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -223,4 +223,10 @@
"order by examinationDate" +
"</script>"})
List<Map<String ,Object>> getPacsJcList(@Param("name")String name,@Param("mzh")String mzh,@Param("start")String start,@Param("end")String end);
+
+
+
+ @DataSource(value = DataSourceType.SLAVE_LIS)
+ @Select("SELECT * FROM vi_his_patientresult LIMIT 10")
+ List<Map<String, Object>> getCcXZxYyLisJgSt();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index ee4452c..d8e059a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -161,4 +161,12 @@
" AND (a.pro_name LIKE '%蹇冪數鍥�%' OR a.pro_name LIKE '%濡囨煡%' OR a.pro_name LIKE '%hpv%' OR a.pro_name LIKE '%tct%' OR a.pro_name LIKE '%濡囩浜旇仈妫�%'\n" +
" OR a.pro_name LIKE '%鐢靛瓙闃撮亾闀滄鏌�%' OR a.pro_name LIKE '%C14%' OR a.pro_name LIKE '%蹇冪悊妫�娴�%' OR a.pro_name LIKE '%鑲哄姛鑳芥鏌�%' OR a.pro_name LIKE '%闈欒剦%');")
boolean updateRemark(String tjNum);
+
+
+
+ @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
+ "\n" +
+ "WHERE a.deleted=0 AND b.org_type=3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
+// AND c.need_report='Y' guo
+ List<TjOrderRemark> notHuaYanData(String tjnumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index e28320f..d3550d0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -63,4 +63,7 @@
//淇敼鎸囧畾椤圭洰(蹇冪數鍥剧瓑)鐘舵��
boolean updateRemark(String tjNum);
+
+
+ List<TjOrderRemark> notHuaYanData(String tjnumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index c7af6a4..163a1b6 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Collections;
import java.util.List;
/**
@@ -112,4 +113,9 @@
return mapper.updateRemark(tjNum);
}
+ @Override
+ public List<TjOrderRemark> notHuaYanData(String tjnumber) {
+ return mapper.notHuaYanData(tjnumber);
+ }
+
}
--
Gitblit v1.8.0