From 4d5cfc8b130da38ce57b22e4eb1b0c6b26d84955 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 07 五月 2025 08:32:31 +0800
Subject: [PATCH] zjh20250507
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 21 ++----
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 52 ++++++++---------
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 41 +++++++------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 25 +++----
4 files changed, 65 insertions(+), 74 deletions(-)
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 a4c4373..d941288 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
@@ -2193,7 +2193,7 @@
LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjProject::getProId, entry.getKey().getProId());
TjProject one11 = projectService.getOne(wqqq);
- if (entry.getValue() == null || entry.getValue().isEmpty()) continue;
+ if (entry.getValue() == null || entry.getValue().isEmpty() || entry.getValue().equals("null")) continue;
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
if (null != one11 && "Y".equals(one11.getNeedReport())) {
TjOrderRemark orderRemark = entry.getKey();
@@ -2540,7 +2540,7 @@
document1.add(ppp);
}
}else{
- if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
+ 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);
@@ -3032,7 +3032,14 @@
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId()) && entry.getKey().getType() == 1) {
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
- tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ if(tjProject.getProDelivery()==1){
+ if(StringUtil.isNotBlank(tjOrderDetail.getConclusion())){
+ tjPdfVO.setProResult(tjOrderDetail.getProResult()+" "+tjOrderDetail.getConclusion());
+ }
+ }else {
+ tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ }
+
tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
if (null != tjProject.getProMetering()) {
tjPdfVO.setCompany(tjProject.getProMetering());
@@ -3063,12 +3070,7 @@
}
private void pacsJianChaData(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);
+
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.pacsJianChaData(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark, null);
@@ -3104,8 +3106,17 @@
if (null != list && !list.isEmpty()) {
LtkjExamJcbgd jcbgd = list.get(0);
if (jcbgd != null) {
- tjPdfVO.setTs(jcbgd.getYxbx());
- tjPdfVO.setSj(jcbgd.getBgNr());
+ String yxbx = jcbgd.getYxbx();
+ String bgNr = jcbgd.getBgNr();
+ // 姝ｅ垯琛ㄨ揪寮忥細鍖归厤鏁板瓧鍚庤窡 '.' 鎴� '銆�'
+ String regex = "\\d+[\\.,銆乚";
+// String regex = "(?<=\\d+)([\\.,銆乚)";
+ // 浣跨敤姝ｅ垯鏇挎崲锛屽尮閰嶇殑鏁板瓧鍚庢坊鍔犳崲琛岀
+ yxbx = yxbx.replaceAll(regex, "\n$0");
+// bgNr = bgNr.replaceAll(regex, "\n$0");
+
+ tjPdfVO.setTs(yxbx);
+ tjPdfVO.setSj(bgNr);
tjPdfVO.setShys(jcbgd.getShysxm());
tjPdfVO.setProName(jcbgd.getXmmc());
ids += "|" + jcbgd.getXmdm();
@@ -3115,14 +3126,6 @@
}
}
}
-// if(!tjPdfVOS.isEmpty()){
-// tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
-// tjPdfVOS = tjPdfVOS.stream()
-// .sorted(Comparator.comparingInt(
-// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
-// ))
-// .collect(Collectors.toList());
-// }
printReport.put(entry.getKey(), tjPdfVOS);
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 6054b1b..7587c82 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -614,20 +614,19 @@
wq.eq(TjOrderYcxm::getJcxm, detail.getProName());
ycxmService.remove(wq);
if (detail.getExceptionDesc() == 1) {
+ String replacedAll = detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
if(!detail.getProName().contains("鑸掑紶鍘�") && !detail.getProName().contains("鏀剁缉鍘�")){
- List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
- , detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), "", order.getTjNumber()
- , detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
- , detail.getProResult());
+
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString(), replacedAll, "", order.getTjNumber()
+ , replacedAll, detail.getProResult());
String[] split = detail.getProResult().split("銆倈,|锛�");
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- s = s.replaceAll("\n", "");
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
if (null != mapss && !mapss.isEmpty()) {
@@ -667,17 +666,13 @@
}else {
List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
- , detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), "", order.getTjNumber()
- , detail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
- , detail.getProResult());
+ , replacedAll, "", order.getTjNumber(), replacedAll, detail.getProResult());
String[] split = detail.getProResult().split("銆倈,|锛�");
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- s = s.replaceAll("\n", "");
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
if (null != mapss && !mapss.isEmpty()) {
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 76d1235..e7c9a49 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
@@ -1760,13 +1760,11 @@
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
if (!tjOrderDetail.getDeptId().equals("2")) {
- List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
- , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""),
- tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
- , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
- , tjOrderDetail.getProResult());
+ String replacedAll = tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
+
+ List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),replacedAll,
+ tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber,replacedAll, tjOrderDetail.getProResult());
if (null != maps && !maps.isEmpty()) {
@@ -1777,7 +1775,7 @@
String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- s = s.replaceAll("\n", "");
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb);
if (null != maps && !maps.isEmpty()) {
@@ -1851,12 +1849,11 @@
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
if (!tjOrderDetail.getDeptId().equals("2")) {
+ String replacedAll = tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "").replaceAll("鈼�", "");
+
List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
- , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", ""), tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
- , tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇", "").replaceAll("\\[.*?\\]", "")
- , tjOrderDetail.getProResult());
+ ,replacedAll,tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber,replacedAll, tjOrderDetail.getProResult());
if (null != maps && !maps.isEmpty()) {
@@ -1867,7 +1864,7 @@
String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
List<Map<String, Object>> mapList = new ArrayList<>();
for (String s : split) {
- s = s.replaceAll("\n", "");
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");;
Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
if (null != maps && !maps.isEmpty()) {
Object bt = maps.get("bt");
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 269b983..fe32a38 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
@@ -27,7 +27,7 @@
List<TjOrderRemark> getTjOrderRemarkListByTjNum(String tjNumber);
@Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted='0'")
- TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber,@Param("proParentId") String proParentId);
+ TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber, @Param("proParentId") String proParentId);
@Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type IN (0,3) AND deleted=0")
int getTjYqOrderRemarkByTjNum(String tjNumber);
@@ -51,7 +51,6 @@
String getTjOrderRemarkProIdList(String tjNumber);
-
@Insert("INSERT INTO tj_order_remark(\n" +
"pro_id,\n" +
"dept_id,\n" +
@@ -68,7 +67,7 @@
"SELECT b.pro_id,b.dept_id,SYSDATE(),#{userName},#{userId},#{tjNumber},#{userName},SYSDATE(),#{userId},IF(b.need_report<>'Y',1,0) FROM tj_order_detail a " +
"LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.order_id=#{orderId} AND\n" +
"b.pro_parent_id=0")
- boolean saveTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
+ boolean saveTjOrderRemarkByOrderId(@Param("tjNumber") String tjNumber, @Param("userName") String userName, @Param("userId") String userId, @Param("orderId") String orderId);
@Insert("INSERT INTO tj_order_remark(\n" +
@@ -87,12 +86,12 @@
"SELECT b.pro_id,b.dept_id,SYSDATE(),#{userName},#{userId},#{tjNumber},1,#{userName},SYSDATE(),#{userId} FROM tj_order_detail a " +
"LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.order_id=#{orderId} AND\n" +
"b.pro_parent_id=0")
- boolean saveJSYTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);
-
+ boolean saveJSYTjOrderRemarkByOrderId(@Param("tjNumber") String tjNumber, @Param("userName") String userName, @Param("userId") String userId, @Param("orderId") String orderId);
@Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.tj_number=#{tjNumber}" +
- " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")//and a.dept_id in (269,270,253,254,255,257)
+ " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")
+//and a.dept_id in (269,270,253,254,255,257)
List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);
@@ -103,13 +102,13 @@
@Select("SELECT b.pro_id FROM tj_package_project a " +
"LEFT JOIN tj_order_remark b ON a.pro_id=b.pro_id " +
"WHERE b.type !=2 AND b.pro_id = a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
- List<Long> getTjProIdsByTjNumAndPacIc(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId);
+ List<Long> getTjProIdsByTjNumAndPacIc(@Param("tjNumber") String tjNumber, @Param("pacId") String pacId);
@Select("SELECT b.pro_id FROM tj_package_project a " +
"LEFT JOIN tj_order_remark b ON a.pro_id=b.pro_id " +
"WHERE b.type !=2 AND b.pro_id != a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}")
- List<Long> getTjProIdsByTjNumAndPacIc1(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId);
+ List<Long> getTjProIdsByTjNumAndPacIc1(@Param("tjNumber") String tjNumber, @Param("pacId") String pacId);
@Select({"<script>" +
@@ -135,10 +134,10 @@
// " re.type != 2 AND\n" +
" re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y'" +
" <when test='sfzpacs == true'> " +
- " AND dep.org_type = 2"+
- " </when>"+
+ " AND dep.org_type = 2" +
+ " </when>" +
"</script>"})
- List<CsProVo> cSWebGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber,@Param("sfzpacs") boolean sfzpacs );
+ List<CsProVo> cSWebGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber, @Param("sfzpacs") boolean sfzpacs);
@Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
@@ -146,11 +145,11 @@
List<TjOrderRemark> addHuaYanTable(@Param("tjnumber") String tjnumber);
@Select("call pro_checkhyAndcg(0,#{tjnumber,mode=IN})")
- List<TjOrderRemark> addHuaYanAndCgTable(@Param("tjnumber")String tjnumber);
+ List<TjOrderRemark> addHuaYanAndCgTable(@Param("tjnumber") String tjnumber);
@Update("UPDATE tj_order_remark a SET a.type=2 WHERE a.tj_number=#{tjnumber} AND a.pro_id=#{proId}")
- void updateTjOrderRemark(@Param("tjnumber")String tjnumber,@Param("proId")String proId);
+ void updateTjOrderRemark(@Param("tjnumber") String tjnumber, @Param("proId") String proId);
@Delete("DELETE FROM tj_order_remark WHERE jxbz=#{bldh}")
void deleteTjOrderDetailByjxbz(String bldh);
@@ -168,7 +167,6 @@
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}")
@@ -176,9 +174,10 @@
@Select("call notHuaYanData(#{tjnumber,mode=IN})")
List<TjOrderRemark> notHuaYanData(String tjnumber);
- @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 = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
+ // @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 = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
+ @Select("call pacsJianChaData(#{tjnumber,mode=IN})")
List<TjOrderRemark> pacsJianChaData(String tjnumber);
@@ -189,7 +188,7 @@
List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu3(@Param("tjNumber") String tjNumber);
- void tjYishengjianchajianyi(Map<String,Object> map);
+ void tjYishengjianchajianyi(Map<String, Object> map);
@Select("SELECT COUNT(*) a FROM tj_order_remark a WHERE a.deleted=0 AND a.tj_number=#{tjNum} AND a.type =1;")
@@ -203,7 +202,7 @@
"SET\n" +
" a.sfbz=#{ls}\n" +
"WHERE b.order_id=#{orderId} AND a.jxbz=#{jxbz}")
- void updateTjOrderRemarkSfbzByJxbz(@Param("orderId") String orderId,@Param("jxbz") String jxbz,@Param("ls") String ls);
+ void updateTjOrderRemarkSfbzByJxbz(@Param("orderId") String orderId, @Param("jxbz") String jxbz, @Param("ls") String ls);
@Update("\n" +
@@ -211,7 +210,7 @@
"SET\n" +
" a.sfbz=#{ls}\n" +
"WHERE b.order_id=#{orderId} AND ISNULL(a.jxbz)")
- void updateTjOrderRemarkSfbzByJxbzisnull(@Param("orderId") String orderId,@Param("ls") String ls);
+ void updateTjOrderRemarkSfbzByJxbzisnull(@Param("orderId") String orderId, @Param("ls") String ls);
@Select({"<script>", "SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id ",
@@ -219,15 +218,14 @@
"<foreach collection='split' item='id' open='(' separator=',' close=')'>",
"#{id}",
"</foreach>",
- "</script>" })
- List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") Set<Integer> split);
+ "</script>"})
+ List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber, @Param("split") Set<Integer> split);
@Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id\n" +
"\n" +
"WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} \n")
List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(@Param("tjNumber") String tjNumber);
-
@Select({"<script>" +
@@ -251,7 +249,7 @@
" LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
" WHERE\n" +
" re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y'" +
- " AND dep.org_type in (1,2 )"+
+ " AND dep.org_type in (1,2 )" +
"</script>"})
List<CsProVo> ysjcGetProByTjNumAndOrderId(@Param("tjNumber") String tjNumber);
@@ -277,10 +275,9 @@
" WHERE\n" +
// " re.type != 2 AND\n" +
" re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y' " +
- " AND dep.org_type = 1"+
+ " AND dep.org_type = 1" +
"</script>"})
List<CsProVo> cSWebGetProByTjNumAndOrderIdJy(String tjNumber);
-
List<TjOrderRemark> shoufeiyemianyishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);
@@ -288,8 +285,7 @@
List<TjOrderRemark> shoufeiyemianweishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);
@Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
- List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber,@Param("ks")String ks);
-
+ List<CsProVo> getYxJcXx(@Param("tjh") String tjNumber, @Param("ks") String ks);
@Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id \n" +
--
Gitblit v1.8.0