From f3445e5babad91627609b898dbc9b5ed844d7cdd Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 16 七月 2024 18:09:18 +0800
Subject: [PATCH] zjh 2024/07/16-1
---
ltkj-admin/src/main/java/com/ltkj/web/config/pdfutils/PdfUtils.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 87 +++-
ltkj-admin/src/main/java/com/ltkj/web/config/JacksonConfig.java | 25 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 428 +++++++++++++-------------
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 381 ++++++++++------------
ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java | 2
7 files changed, 471 insertions(+), 460 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/JacksonConfig.java b/ltkj-admin/src/main/java/com/ltkj/web/config/JacksonConfig.java
new file mode 100644
index 0000000..dfe3bc5
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/JacksonConfig.java
@@ -0,0 +1,25 @@
+package com.ltkj.web.config;
+
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.math.BigInteger;
+
+@Configuration
+public class JacksonConfig {
+
+ /**
+ * Jackson鍏ㄥ眬杞寲long绫诲瀷涓篠tring锛岃В鍐砵ackson搴忓垪鍖栨椂浼犲叆鍓嶇Long绫诲瀷缂哄け绮惧害闂
+ * @return
+ */
+ @Bean
+ public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() {
+ return builder -> builder
+ .serializerByType(BigInteger.class, ToStringSerializer.instance)
+ .serializerByType(Long.class, ToStringSerializer.instance);
+ }
+
+}
+
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/pdfutils/PdfUtils.java b/ltkj-admin/src/main/java/com/ltkj/web/config/pdfutils/PdfUtils.java
index df49606..bdbf52d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/pdfutils/PdfUtils.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/pdfutils/PdfUtils.java
@@ -152,7 +152,7 @@
*/
public static PdfPTable setTable(Font headFont, Font textFont, String[] title, List<TjPdfVO> list) {
//鍥涘垪
- PdfPTable table = createTable(new float[]{120, 120, 120, 120});
+ PdfPTable table = createTable(new float[]{120, 120, 120});
//鐢绘爣棰�
for (String head : title) {
table.addCell(createCell(head, headFont));
@@ -162,7 +162,7 @@
table.addCell(createCell(tjPdfVO.getProName(), textFont));
table.addCell(createCell(tjPdfVO.getProResult(), textFont));
table.addCell(createCell(tjPdfVO.getCompany(), textFont));
- table.addCell(createCell(tjPdfVO.getStandardValue(), textFont));
+// table.addCell(createCell(tjPdfVO.getStandardValue(), textFont));
}
return table;
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
index 7f18c74..ecd0852 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
@@ -145,7 +145,7 @@
AjaxResult xinXi = suijieHisXinXi(tjCustomer);
if(!xinXi.get("code").toString().equals("200")){
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("娣诲姞灏辫瘖浜轰俊鎭け璐�!" + xinXi.get("msg").toString());
+ return AjaxResult.error("娉ㄥ唽澶辫触,璇峰埌鍓嶅彴鐧昏!" + xinXi.get("msg").toString());
}
}
}
@@ -169,7 +169,7 @@
AjaxResult xinXi = suijieHisXinXi(tjCustomer);
if(!xinXi.get("code").toString().equals("200")){
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("娣诲姞灏辫瘖浜轰俊鎭け璐�!" + xinXi.get("msg").toString());
+ return AjaxResult.error("娉ㄥ唽澶辫触,璇峰埌鍓嶅彴鐧昏!" + xinXi.get("msg").toString());
}
}
return AjaxResult.success(tjCustomer);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index 07fe543..be9a9cc 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -15,6 +15,8 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.mall.mallOrderUtils.TjConstants;
@@ -54,39 +56,36 @@
@Resource
private ITjReportService reportService;
-
@Resource
private ITjCustomerService customerService;
@Autowired
private ITjOrderService orderService;
-
@Autowired
private ITjOrderDetailService detailService;
-
@Resource
private ITjProjectService projectService;
-
@Resource
private ITjOrderRemarkService remarkService;
-
@Resource
private ITjStandardService standardService;
-
@Resource
private ITjAdviceService adviceService;
-
@Resource
private IDictCompService compService;
-
@Resource
private ITjReportTemplateService reportTemplateService;
-
@Value("${path.filePath}")
private String value;
@Resource
private LtkjHybgdService ltkjHybgdService;
@Resource
private LtkjHysqdService ltkjHysqdService;
+ @Resource
+ private LtkjExamJcbgdService jcbgdService;
+ @Resource
+ private LtkjExamJcsqdService jcsqdService;
+
+
/**
* 灏忕▼搴忔煡璇綋妫�鎶ュ憡鍒楄〃
*/
@@ -131,7 +130,7 @@
public AjaxResult getRelativeReportList(@RequestParam @ApiParam(value = "濮撳悕") String cusName,
@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusIdcard) {
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjCustomer::getCusName, cusName);
+ wq1.like(TjCustomer::getCusName, cusName);
wq1.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer customer = customerService.getOne(wq1);
if (null != customer) {
@@ -208,26 +207,27 @@
}
LambdaQueryWrapper<TjProject> wqqqq = new LambdaQueryWrapper<>();
wqqqq.eq(TjProject::getProId, tjOrderDetail.getProId());
+ wqqqq.eq(TjProject::getNeedReport,"Y");
tjOrderDetail.setProject(projectService.getOne(wqqqq));
- LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
- wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
- List<TjStandard> list2 = standardService.list(wq6);
- if (list2.size() == 0) {
- tjOrderDetail.setStandard(null);
- } else if (list2.size() == 1) {
- tjOrderDetail.setStandard(list2.get(0));
- } else {
- for (TjStandard tjStandard : list2) {
- LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
- if (tjStandard.getTjSex() != null) {
- wq8.eq(TjStandard::getTjSex, customer.getCusSex());
- }
- if (tjStandard.getTjType() != null) {
- wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
- }
- tjOrderDetail.setStandard(standardService.getOne(wq8));
- }
- }
+ // LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
+// wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
+// List<TjStandard> list2 = standardService.list(wq6);
+// if (list2.size() == 0) {
+// tjOrderDetail.setStandard(null);
+// } else if (list2.size() == 1) {
+// tjOrderDetail.setStandard(list2.get(0));
+// } else {
+// for (TjStandard tjStandard : list2) {
+// LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
+// if (tjStandard.getTjSex() != null) {
+// wq8.eq(TjStandard::getTjSex, customer.getCusSex());
+// }
+// if (tjStandard.getTjType() != null) {
+// wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
+// }
+// tjOrderDetail.setStandard(standardService.getOne(wq8));
+// }
+// }
}
LambdaQueryWrapper<TjAdvice> wq3 = new LambdaQueryWrapper<>();
wq3.eq(TjAdvice::getProId, remark.getProId());
@@ -299,6 +299,35 @@
}
+
+ @GetMapping("/getJcReportByTjNumber")
+ @ApiOperation(value = "灏忕▼搴�-浣撴妫�鏌ユ姤鍛婃煡璇㈣鎯�")
+ public AjaxResult getJcReportByTjNumber(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrder::getTjNumber, tjNumber);
+ wq1.eq(TjOrder::getCheckStatus, 1);
+ TjOrder one = orderService.getOne(wq1);
+ if (one == null) {
+ return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
+ }
+ List<LtkjExamJcsqd> jcsqdList = jcsqdService.getLtkjJcsqdByTjh(one.getCardId());
+ if(null !=jcsqdList && jcsqdList.size()>0){
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (LtkjExamJcsqd jcsqd : jcsqdList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("parent",jcsqd.getJcxmmc());
+ map.put("jcbx",jcsqd.getJgbx());
+ List<LtkjExamJcbgd> jcbgdList = jcbgdService.getJianJcBaoGaoDanList(jcsqd.getTmh());
+ map.put("sons",jcbgdList);
+ list.add(map);
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.success("璇ュ鎴峰湪娌℃湁浣撴椤圭洰鏁版嵁锛�");
+ }
+
+
+
/**
* 灏忕▼搴忕偣鍑讳綋妫�鎶ュ憡鏌ヨ璇︽儏,鏄剧ず韬珮浣撻噸浣撻噸鎸囨暟鏀剁缉鍘嬭垝寮犲帇
*/
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 da10175..d07d1c7 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
@@ -71,15 +71,16 @@
private LtkjHysqdService ltkjHysqdService;
@Autowired
private LtkjGetexamreportinfoService ltkjGetexamreportinfoService;
- @Value("${path.filePath}")
+ @Value ("${path.filePath}")
private String value;
- @Value("${path.reportServer}")
+ @Value ("${path.reportServer}")
private String urlValue;
// private static final
/**
* 閫氳繃his API璇锋眰鑾峰彇鏁版嵁鐢熸垚PDF
+ *
* @param pdfInfoMap
* @param params
* @param tjOrder
@@ -88,7 +89,7 @@
* @deprecated 鏈夋暟鎹悓姝ヤ笉鍦ㄨ皟鐢ㄦ帴鍙ｈ幏鍙栨暟鎹洿鎺ユ煡鏁版嵁搴撴嬁鏁版嵁鐢熸垚
*/
@Deprecated
- public AjaxResult execHisRequest(HashMap<String, Object> pdfInfoMap, Map<String, Object> params,TjOrder tjOrder,TjReportTemplate tjReportTemplate) {
+ public AjaxResult execHisRequest(HashMap<String, Object> pdfInfoMap, Map<String, Object> params, TjOrder tjOrder, TjReportTemplate tjReportTemplate) {
List<Map<String, Object>> list;
String hisRegistrationId = params.get("his_registration_id").toString();
AjaxResult getlabreportinfo = apiGetMethodService.getHISDataNew("Getlabreportinfo", params);
@@ -138,7 +139,7 @@
putData(obj, getexamreportinfo, "妫�鏌ユ姤鍛�");
jsonArray.put(obj);
// System.out.println(JSONUtil.toJsonStr(jsonArray));
- if (makePDF(hisRegistrationId, jsonArray,tjOrder,tjReportTemplate)) {
+ if (makePDF(hisRegistrationId, jsonArray, tjOrder, tjReportTemplate)) {
log.info("宸茬敓鎴愭姤鍛�");
return AjaxResult.success("宸茬敓鎴愭姤鍛婏紒鍙洿鎺ョ偣鍑婚瑙堬紒");
} else return AjaxResult.error();
@@ -168,7 +169,7 @@
}
}
- public AjaxResult hisPDF(TjOrder tjOrder,TjCustomer customer,TjReportTemplate tjReportTemplate) throws DocumentException {
+ public AjaxResult hisPDF(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate) throws DocumentException {
HashMap<String, Object> pdfChangGui = makePDFInfo(tjOrder, customer, tjReportTemplate);
Document document = (Document) pdfChangGui.get("document");
PdfCopy copy = (PdfCopy) pdfChangGui.get("copy");
@@ -177,7 +178,7 @@
Document document1 = new Document(PageSize.A4);
PdfWriter pdfWriter = null;
try {
- pdfWriter = PdfWriter.getInstance(document1, byteArrayOutputStream1);
+ pdfWriter = PdfWriter.getInstance(document1, byteArrayOutputStream1);
} catch (DocumentException e) {
e.printStackTrace();
return AjaxResult.error();
@@ -186,7 +187,7 @@
document1.open();
// 闈炲寲楠岄」鐩姤鍛�
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
- notHuaYanData(tjOrder.getTjNumber(), printReport,tjOrder,customer);
+ notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
notHuaYanTable(document1, printReport);
} catch (DocumentException e) {
@@ -227,14 +228,14 @@
return AjaxResult.error();
}
String outputFileName1 = customer.getCusId() + tjOrder.getTjNumber() + customer.getCusName() + "_鎶ュ憡.pdf";
- savePDFFile(outputFileName1,tjOrder, customer, finalOutPut);
+ savePDFFile(outputFileName1, tjOrder, customer, finalOutPut);
TjReport tjReport = new TjReport();
String tjNumber = tjOrder.getTjNumber();
tjReport.setTjNumber(String.valueOf(tjNumber));
tjReport.setPath(urlValue + outputFileName1);
// 鏂囦欢閰嶇疆
// String outputPath1 = "/Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/";
- String outputPath1 = value+"\\";
+ String outputPath1 = value + "\\";
String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
@@ -252,6 +253,7 @@
/**
* 鐢熸垚妫�鏌ヨ〃鏍�
+ *
* @param tjOrder
* @return
*/
@@ -283,8 +285,8 @@
String sqrxm = getexamreportinfo.getSqrxm();
String zyh = "";
String ch = "";
- String footer = "鐢宠浜猴細"+sqrxm + " 瀹℃牳鍖诲笀锛�"+shysqm+" 鍖诲笀绛惧悕锛�"+bgysqm;
- ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null,footer);
+ String footer = "鐢宠浜猴細" + sqrxm + " 瀹℃牳鍖诲笀锛�" + shysqm + " 鍖诲笀绛惧悕锛�" + bgysqm;
+ ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer);
jianchas.add(outputStream);
}
return jianchas;
@@ -292,14 +294,15 @@
/**
* PDF鏂囦欢瀛樺偍鑷虫湰鍦�
+ *
* @param tjOrder
* @param customer
* @param finalOutPut
*/
- private void savePDFFile(String outputFileName1,TjOrder tjOrder, TjCustomer customer, ByteArrayOutputStream finalOutPut) {
+ private void savePDFFile(String outputFileName1, TjOrder tjOrder, TjCustomer customer, ByteArrayOutputStream finalOutPut) {
// 鏂囦欢閰嶇疆
// String outputPath1 = "/Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/";
- String outputPath1 = value+"\\";
+ String outputPath1 = value + "\\";
File file = new File(outputPath1 + outputFileName1);
BufferedOutputStream outputStream = null;
try {
@@ -316,12 +319,13 @@
/**
* 濉厖妫�楠岃〃鏍兼暟鎹�
+ *
* @param document1
* @param map
* @throws DocumentException
*/
private static void makeHisJianYanTable(Document document1, HashMap<String, Object> map) throws DocumentException {
- if (!map.isEmpty()){
+ if (!map.isEmpty()) {
String[] titles = new String[]{"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅", "鍙傝�冭寖鍥�"};
float[] titlesWidth = new float[]{120, 120, 120, 120};
for (Map.Entry<String, Object> entry : map.entrySet()) {
@@ -329,14 +333,14 @@
HashMap<String, Object> entryValue = (HashMap<String, Object>) entry.getValue();
HashSet<String> jyys = (HashSet<String>) entryValue.get("jyys");
ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
- addJianYanTable(document1,titleName,titles,titlesWidth,lists);
+ addJianYanTable(document1, titleName, titles, titlesWidth, lists);
Font doctorFonts = PdfUtils.setFont(9);
String doctors = "";
for (String s : jyys) {
- doctors+=s+"銆�";
+ doctors += s + "銆�";
}
String substring = doctors.substring(0, doctors.length() - 1);
- Paragraph df = PdfUtils.setParagraph(doctorFonts, "妫�楠屽尰甯堬細"+substring);
+ Paragraph df = PdfUtils.setParagraph(doctorFonts, "妫�楠屽尰甯堬細" + substring);
df.setAlignment(Element.ALIGN_RIGHT);
document1.add(df);
//鍒嗗壊绾�
@@ -348,156 +352,156 @@
/**
* 闈炲寲楠岄」鐩〃鏍煎～鍏�
+ *
* @param document1
* @param printReport
* @throws DocumentException
*/
private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport) throws DocumentException {
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
- List<TjPdfVO> value = entry.getValue();
LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjProject::getProId, entry.getKey().getProId());
TjProject one11 = projectService.getOne(wqqq);
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
- if (null != one11 && "N".equals(one11.getNeedReport())) {
- continue;
- }
- String titleName = null;
- if (null != one11 && "1".equals(one11.getResultType())) {
- titleName = one11.getProName();
- // TODO 鍗曚綅
- // 璁剧疆鏍囬瀛椾綋鏍峰紡
- Font titleFonts = PdfUtils.setFont(9);
- Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
- String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉","鍗曚綅"};
- // 鑾峰彇鍒楄〃鏁版嵁
- //璁剧疆琛ㄥご瀛椾綋鏍峰紡
- Font headFont = PdfUtils.setFont(9);
- // 璁剧疆姝ｆ枃瀛椾綋鏍峰紡锛�12鍙�
- Font textFont = PdfUtils.setFont(9);
- //鍒涘缓琛ㄦ牸 灏嗚〃澶村瓧浣撳拰姝ｆ枃瀛椾綋鏀捐繘鍘�
- PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value);
- document1.add(paragraph);
- document1.add(table);
- //鍒ゆ柇澶囨敞鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
- if (entry.getKey().getRemark() == null) {
- entry.getKey().setRemark("");
- }
- String remark = "澶囨敞锛�" + entry.getKey().getRemark();
- if (entry.getKey().getRemark().length() > 50) {
- int j = 0;
- for (int i = 0; i < remark.length() / 50; i++) {
- String substring = remark.substring(j, j + 50);
- Font remarkFonts = PdfUtils.setFont(9);
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
- document1.add(pp);
- j = j + 50;
- }
- if (remark.length() % 50 != 0) {
- String substring = remark.substring((remark.length() / 50) * 50, remark.length() - 1);
- Font remarkFonts = PdfUtils.setFont(9);
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
- document1.add(pp);
- }
- } else {
- Font remarkFonts = PdfUtils.setFont(9);
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
- document1.add(pp);
- }
- //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
- if (null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) {
- //涓绘鍖诲笀
- String doctorName = "涓绘鍖诲笀锛�" + userService.getById(entry.getKey().getDoctorName()).getNickName();
- Font doctorFonts = PdfUtils.setFont(9);
- Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
- df.setAlignment(Element.ALIGN_RIGHT);
- document1.add(df);
- } else {
- String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
- Font doctorFonts = PdfUtils.setFont(9);
- Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
- df.setAlignment(Element.ALIGN_RIGHT);
- document1.add(df);
- }
- //鍒嗗壊绾�
- LineSeparator objectName = new LineSeparator();
- document1.add(objectName);
- } else {
- if (null != one11) {
+ if (null != one11 && "Y".equals(one11.getNeedReport())) {
+ List<TjPdfVO> value = entry.getValue();
+ String titleName = null;
+ if (null != one11 && "1".equals(one11.getResultType())) {
titleName = one11.getProName();
- } else {
- titleName = entry.getKey().getProName();
- }
- // 璁剧疆鏍囬瀛椾綋鏍峰紡
- Font titleFonts = PdfUtils.setFont(9);
- Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
- String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅", "鍙傝�冭寖鍥�"};
- // 鑾峰彇鍒楄〃鏁版嵁
- //璁剧疆琛ㄥご瀛椾綋鏍峰紡
- Font headFont = PdfUtils.setFont(9);
- // 璁剧疆姝ｆ枃瀛椾綋鏍峰紡锛�12鍙�
- Font textFont = PdfUtils.setFont(9);
- //鍒涘缓琛ㄦ牸 灏嗚〃澶村瓧浣撳拰姝ｆ枃瀛椾綋鏀捐繘鍘�
- PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value);
- document1.add(paragraph);
- document1.add(table);
- //鍒ゆ柇澶囨敞鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
- if (entry.getKey().getRemark() == null) {
- entry.getKey().setRemark("");
- }
- String remark = "澶囨敞锛�" + entry.getKey().getRemark();
- if (entry.getKey().getRemark().length() > 50) {
- int j = 0;
- for (int i = 0; i < remark.length() / 50; i++) {
- String substring = remark.substring(j, j + 50);
- Font remarkFonts = PdfUtils.setFont(9);
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
- document1.add(pp);
- j = j + 50;
+ // TODO 鍗曚綅
+ // 璁剧疆鏍囬瀛椾綋鏍峰紡
+ Font titleFonts = PdfUtils.setFont(9);
+ Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
+ String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
+ // 鑾峰彇鍒楄〃鏁版嵁
+ //璁剧疆琛ㄥご瀛椾綋鏍峰紡
+ Font headFont = PdfUtils.setFont(9);
+ // 璁剧疆姝ｆ枃瀛椾綋鏍峰紡锛�12鍙�
+ Font textFont = PdfUtils.setFont(9);
+ //鍒涘缓琛ㄦ牸 灏嗚〃澶村瓧浣撳拰姝ｆ枃瀛椾綋鏀捐繘鍘�
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value);
+ document1.add(paragraph);
+ document1.add(table);
+ //鍒ゆ柇澶囨敞鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
+ if (entry.getKey().getRemark() == null) {
+ entry.getKey().setRemark("");
}
- if (remark.length() % 50 != 0) {
- String substring = remark.substring((remark.length() / 50) * 50, remark.length() - 1);
+ String remark = "澶囨敞锛�" + entry.getKey().getRemark();
+ if (entry.getKey().getRemark().length() > 50) {
+ int j = 0;
+ for (int i = 0; i < remark.length() / 50; i++) {
+ String substring = remark.substring(j, j + 50);
+ Font remarkFonts = PdfUtils.setFont(9);
+ Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
+ document1.add(pp);
+ j = j + 50;
+ }
+ if (remark.length() % 50 != 0) {
+ String substring = remark.substring((remark.length() / 50) * 50, remark.length() - 1);
+ Font remarkFonts = PdfUtils.setFont(9);
+ Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
+ document1.add(pp);
+ }
+ } else {
Font remarkFonts = PdfUtils.setFont(9);
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
+ Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
document1.add(pp);
}
+ //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
+ if (null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) {
+ //涓绘鍖诲笀
+ String doctorName = "涓绘鍖诲笀锛�" + userService.getById(entry.getKey().getDoctorName()).getNickName();
+ Font doctorFonts = PdfUtils.setFont(9);
+ Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+ df.setAlignment(Element.ALIGN_RIGHT);
+ document1.add(df);
+ } else {
+ String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
+ Font doctorFonts = PdfUtils.setFont(9);
+ Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+ df.setAlignment(Element.ALIGN_RIGHT);
+ document1.add(df);
+ }
+ //鍒嗗壊绾�
+ LineSeparator objectName = new LineSeparator();
+ document1.add(objectName);
} else {
- Font remarkFonts = PdfUtils.setFont(9);
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
- document1.add(pp);
+ if (null != one11) {
+ titleName = one11.getProName();
+ } else {
+ titleName = entry.getKey().getProName();
+ }
+ // 璁剧疆鏍囬瀛椾綋鏍峰紡
+ Font titleFonts = PdfUtils.setFont(9);
+ Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
+ String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
+ // 鑾峰彇鍒楄〃鏁版嵁
+ //璁剧疆琛ㄥご瀛椾綋鏍峰紡
+ Font headFont = PdfUtils.setFont(9);
+ // 璁剧疆姝ｆ枃瀛椾綋鏍峰紡锛�12鍙�
+ Font textFont = PdfUtils.setFont(9);
+ //鍒涘缓琛ㄦ牸 灏嗚〃澶村瓧浣撳拰姝ｆ枃瀛椾綋鏀捐繘鍘�
+ PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value);
+ document1.add(paragraph);
+ document1.add(table);
+ //鍒ゆ柇澶囨敞鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
+ if (entry.getKey().getRemark() == null) {
+ entry.getKey().setRemark("");
+ }
+ String remark = "澶囨敞锛�" + entry.getKey().getRemark();
+ if (entry.getKey().getRemark().length() > 50) {
+ int j = 0;
+ for (int i = 0; i < remark.length() / 50; i++) {
+ String substring = remark.substring(j, j + 50);
+ Font remarkFonts = PdfUtils.setFont(9);
+ Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
+ document1.add(pp);
+ j = j + 50;
+ }
+ if (remark.length() % 50 != 0) {
+ String substring = remark.substring((remark.length() / 50) * 50, remark.length() - 1);
+ Font remarkFonts = PdfUtils.setFont(9);
+ Paragraph pp = PdfUtils.setParagraph(remarkFonts, substring);
+ document1.add(pp);
+ }
+ } else {
+ Font remarkFonts = PdfUtils.setFont(9);
+ Paragraph pp = PdfUtils.setParagraph(remarkFonts, remark);
+ document1.add(pp);
+ }
+ //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
+ if (null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) {
+ //涓绘鍖诲笀
+ String doctorName = "涓绘鍖诲笀锛�" + userService.getById(entry.getKey().getDoctorName()).getNickName();
+ Font doctorFonts = PdfUtils.setFont(9);
+ Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+ df.setAlignment(Element.ALIGN_RIGHT);
+ document1.add(df);
+ } else {
+ String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
+ Font doctorFonts = PdfUtils.setFont(9);
+ Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
+ df.setAlignment(Element.ALIGN_RIGHT);
+ document1.add(df);
+ }
+ //鍒嗗壊绾�
+ LineSeparator objectName = new LineSeparator();
+ document1.add(objectName);
}
- //鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
- if (null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) {
- //涓绘鍖诲笀
- String doctorName = "涓绘鍖诲笀锛�" + userService.getById(entry.getKey().getDoctorName()).getNickName();
- Font doctorFonts = PdfUtils.setFont(9);
- Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
- df.setAlignment(Element.ALIGN_RIGHT);
- document1.add(df);
- } else {
- String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
- Font doctorFonts = PdfUtils.setFont(9);
- Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
- df.setAlignment(Element.ALIGN_RIGHT);
- document1.add(df);
- }
- //鍒嗗壊绾�
- LineSeparator objectName = new LineSeparator();
- document1.add(objectName);
}
}
}
- public HashMap<String, Object> makeHisJianYan(TjOrder tjOrder, TjCustomer customer){
+ public HashMap<String, Object> makeHisJianYan(TjOrder tjOrder, TjCustomer customer) {
// TODO 杩欓噷鍏堜娇鐢ㄦ煡鍏ㄩ儴娴嬭瘯
LambdaQueryWrapper<LtkjHysqd> ltkjHysqdLambdaQueryWrapper = new LambdaQueryWrapper<>();
- ltkjHysqdLambdaQueryWrapper.eq(LtkjHysqd::getTjh,tjOrder.getCardId());
+ ltkjHysqdLambdaQueryWrapper.eq(LtkjHysqd::getTjh, tjOrder.getCardId());
List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
// List<LtkjHysqd> list = ltkjHysqdService.list();
HashMap<String, Object> data = new HashMap<>();
for (LtkjHysqd hysqd : list) {
LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
- ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh,hysqd.getTmh());
+ ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
// 澶х被椤圭洰鍚嶇О
String xmmc = hysqd.getXmmc();
@@ -516,7 +520,7 @@
// String jyys = hybgd.getJyys();
//瀹℃牳鍖荤敓
String shysmc = hybgd.getShysmc();
- if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)){
+ if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
try {
String[] fwzs = fwz.split("-");
BigDecimal min = new BigDecimal(fwzs[0]);
@@ -530,14 +534,15 @@
// jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
jyjg = jyjg + " 鈫�";
}
- } catch (Exception ignored) {}
+ } catch (Exception ignored) {
+ }
}
// LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(SysUser::getUserName,jyys);
// List<SysUser> sysUsers = userService.list(queryWrapper);
// if (!sysUsers.isEmpty())
// hashSet.add(sysUsers.get(0).getNickName());
- if(null !=shysmc) hashSet.add(shysmc);
+ if (null != shysmc) hashSet.add(shysmc);
ArrayList<String> strings = new ArrayList<>();
strings.add(jcxm);
strings.add(jyjg);
@@ -547,8 +552,8 @@
}
if (!lists.isEmpty()) {
HashMap<String, Object> map = new HashMap<>();
- map.put("data",lists);
- map.put("jyys",hashSet);
+ map.put("data", lists);
+ map.put("jyys", hashSet);
data.put(xmmc, map);
}
}
@@ -557,10 +562,11 @@
/**
* 鐢熸垚PDF妯＄増浠ュ強鐢ㄦ埛淇℃伅閮ㄥ垎
+ *
* @param tjOrder
* @param reportTemplate
*/
- public HashMap<String ,Object> makePDFInfo(TjOrder tjOrder,TjCustomer tjCustomer,TjReportTemplate reportTemplate){
+ public HashMap<String, Object> makePDFInfo(TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
String tjNumber = tjOrder.getTjNumber();
String template = reportTemplate.getTemplate();
LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
@@ -658,9 +664,9 @@
// 娣诲姞璇︽儏椤�
document.newPage();
HashMap<String, Object> map = new HashMap<>();
- map.put("document",document);
- map.put("copy",copy);
- map.put("stream",finalOutPut);
+ map.put("document", document);
+ map.put("copy", copy);
+ map.put("stream", finalOutPut);
return map;
} catch (IOException | DocumentException e) {
e.printStackTrace();
@@ -668,7 +674,7 @@
}
}
- public Boolean makePDF(String cardId, JSONArray jsonArray,TjOrder tjOrder,TjReportTemplate reportTemplate) {
+ public Boolean makePDF(String cardId, JSONArray jsonArray, TjOrder tjOrder, TjReportTemplate reportTemplate) {
String tjNumber = tjOrder.getTjNumber();
String template = reportTemplate.getTemplate();
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
@@ -776,7 +782,7 @@
document1.open();
// 闈炲寲楠岄」鐩姤鍛�
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
- notHuaYanData(tjNumber, printReport,tjOrder,tjCustomer);
+ notHuaYanData(tjNumber, printReport, tjOrder, tjCustomer);
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
List<TjPdfVO> value = entry.getValue();
LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
@@ -793,7 +799,7 @@
// 璁剧疆鏍囬瀛椾綋鏍峰紡
Font titleFonts = PdfUtils.setFont(9);
Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
- String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉","鍗曚綅"};
+ String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
// 鑾峰彇鍒楄〃鏁版嵁
//璁剧疆琛ㄥご瀛椾綋鏍峰紡
Font headFont = PdfUtils.setFont(9);
@@ -1034,8 +1040,8 @@
String shysqm = obj.getStr("SHYSQM");
// 鐢宠浜�
String sqrxm = obj.getStr("SQRXM");
- String footer = "鐢宠浜猴細"+sqrxm + " 瀹℃牳鍖诲笀锛�"+shysqm+" "+bgysqm;
- ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null,footer);
+ String footer = "鐢宠浜猴細" + sqrxm + " 瀹℃牳鍖诲笀锛�" + shysqm + " " + bgysqm;
+ ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer);
jianchas.add(outputStream);
}
}
@@ -1064,7 +1070,7 @@
String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
// 鏂囦欢閰嶇疆
// String outputPath1 = "/Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/";
- String outputPath1 = value+"\\";
+ String outputPath1 = value + "\\";
File file = new File(outputPath1 + outputFileName1);
BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file));
outputStream.write(finalOutPut.toByteArray());
@@ -1098,16 +1104,17 @@
/**
* 缁勫悎闈炲寲楠岄」鐩姤鍛婃暟鎹�
+ *
* @param tjNumber
* @param printReport
* @param one
* @param customer
*/
- private void notHuaYanData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport,TjOrder one,TjCustomer 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", "251", "271");
+ wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257", "271");
wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
@@ -1118,61 +1125,21 @@
List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), entry.getKey().getProId());
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
- if (null != tjProject) {
+ if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
tjOrderDetail.setProject(tjProject);
- }
+
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())) {
- LambdaQueryWrapper<TjStandard> wq6 = new LambdaQueryWrapper<>();
- wq6.eq(TjStandard::getProId, tjOrderDetail.getProId());
- List<TjStandard> list2 = tjStandardService.list(wq6);
- if (list2.size() == 0) {
- TjStandard s = new TjStandard();
- s.setCompany(" ");
- s.setTjStandardLtValue(" ");
- s.setTjStandardGtValue(" ");
- tjOrderDetail.setStandard(s);
- } else if (list2.size() == 1) {
- tjOrderDetail.setStandard(list2.get(0));
- } else {
- Long cusSex = customer.getCusSex();
- Date cusBrithday = customer.getCusBrithday();
- int age = DateUtil.ageOfNow(cusBrithday);
- for (TjStandard tjStandard : list2) {
- LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
- if (tjStandard.getTjSex() != null) {
- wq8.eq(TjStandard::getTjSex, cusSex);
- }
- if (tjStandard.getTjType() != null) {
- wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(age));
- }
- TjStandard standard = tjStandardService.getOne(wq8);
- tjOrderDetail.setStandard(standard);
- }
- }
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
tjPdfVO.setProResult(tjOrderDetail.getProResult());
tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
- if (tjOrderDetail.getStandard() != null) {
- //鍗曚綅
- if (tjOrderDetail.getStandard().getCompany() == null) {
- tjPdfVO.setCompany(" ");
- } else {
- tjPdfVO.setCompany(tjOrderDetail.getStandard().getCompany());
- }
- // TODO 璁剧疆鍗曚綅
- //鏈�澶у�煎拰鏈�灏忓��
- String tjStandardGtValue = tjOrderDetail.getStandard().getTjStandardGtValue();
- String tjStandardLtValue = tjOrderDetail.getStandard().getTjStandardLtValue();
- if (tjStandardGtValue == null) {
- tjStandardGtValue = " ";
- }
- if (tjStandardLtValue == null) {
- tjStandardLtValue = " ";
- }
- tjPdfVO.setStandardValue(tjStandardLtValue + "-" + tjStandardGtValue);
+ if(null !=tjProject.getProMetering()){
+ tjPdfVO.setCompany(tjProject.getProMetering());
+ }else {
+ tjPdfVO.setCompany("/");
}
tjPdfVOS.add(tjPdfVO);
+ }
}
}
printReport.put(entry.getKey(), tjPdfVOS);
@@ -1222,7 +1189,6 @@
}
/**
- *
* @param document
* @param titleName
* @param titles
@@ -1301,7 +1267,7 @@
document.add(table);
}
- private static void addJianYanTable(Document document, String titleName, String[] titles, float[] titlesWidth, ArrayList<List<String >> lists) throws DocumentException {
+ private static void addJianYanTable(Document document, String titleName, String[] titles, float[] titlesWidth, ArrayList<List<String>> lists) throws DocumentException {
Font titleFont = PdfUtils.setFont(9);
Paragraph paragraph = new Paragraph(titleName, titleFont);
// 璁剧疆鏂囧瓧灞呬腑
@@ -1344,6 +1310,7 @@
/**
* 鍒涘缓妫�鏌df
+ *
* @param xm
* @param xb
* @param nl
@@ -1360,7 +1327,7 @@
* @param footer
* @return bytearrayoutputstream
*/
- public static ByteArrayOutputStream makeJcPDFByteArrayStream(String xm, String xb, String nl, String jcks, String zyh, String ch, String sjks, String jcsb, String jch, String jcxm, String ms, String ts, File[] files,String footer) {
+ public static ByteArrayOutputStream makeJcPDFByteArrayStream(String xm, String xb, String nl, String jcks, String zyh, String ch, String sjks, String jcsb, String jch, String jcxm, String ms, String ts, File[] files, String footer) {
try {
Document document = new Document(PageSize.A4);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -1528,7 +1495,7 @@
float[] columnWidths = {0.8f, 0.8f, 0.8f, 0.8f, 0.1f, 0.1f, 0.8f, 0.8f, 0.8f, 0.8f};
table2.setWidths(columnWidths);
- if(files != null){
+ if (files != null) {
int imageIndex = 0;
while (imageIndex < files.length) {
// 绗竴寮犲浘鐗囧崰浣嶇
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 a164968..b4a37a5 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
@@ -99,8 +99,8 @@
* @date 2022-11-21
*/
@RestController
-@RequestMapping("/hosp/order")
-@Api(tags = "PC绔� ----浣撴璁板綍鎺ュ彛")
+@RequestMapping ("/hosp/order")
+@Api (tags = "PC绔� ----浣撴璁板綍鎺ュ彛")
@Slf4j
public class TjOrderController extends BaseController {
@Resource
@@ -125,7 +125,7 @@
private ITbTransitionService transitionService;
@Resource
private ISysConfigService configService;
- @Value("${path.filePath}")
+ @Value ("${path.filePath}")
private String value;
@Resource
private ITjOrderRemarkService remarkService;
@@ -217,8 +217,8 @@
* 鏌ヨ浣撴璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:list')")
- @GetMapping("/list")
- @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃(榛樿)")
+ @GetMapping ("/list")
+ @ApiOperation (value = "鏌ヨ浣撴璁板綍鍒楄〃(榛樿)")
public TableDataInfo list(TjOrder tjOrder) {
startPage();
startOrderBy();
@@ -251,16 +251,16 @@
}
- @GetMapping("/getWenJuanList")
- @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃")
- public AjaxResult getWenJuanList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "浣撴鍙�") @RequestParam(required = false) String tjNum,
- @ApiParam(value = "濮撳悕") @RequestParam(required = false) String name,
- @ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam(required = false) Date djbeginTime,
- @ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam(required = false) Date djendTime,
- @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
+ @GetMapping ("/getWenJuanList")
+ @ApiOperation (value = "鏌ヨ浣撴璁板綍鍒楄〃")
+ public AjaxResult getWenJuanList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
+ @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+ @ApiParam (value = "浣撴鍙�") @RequestParam (required = false) String tjNum,
+ @ApiParam (value = "濮撳悕") @RequestParam (required = false) String name,
+ @ApiParam (value = "鐧昏寮�濮嬫椂闂�") @RequestParam (required = false) Date djbeginTime,
+ @ApiParam (value = "鐧昏缁撴潫鏃堕棿") @RequestParam (required = false) Date djendTime,
+ @ApiParam (value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam (required = false) Date bgbeginTime,
+ @ApiParam (value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam (required = false) Date bgendTime) {
Map<String, Object> map = new HashMap<>();
if (null != name) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
@@ -380,16 +380,16 @@
}
- @GetMapping("/getOrderList")
- @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃")
- public AjaxResult getOrderList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
- @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam(required = false) Date djbeginTime,
- @ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam(required = false) Date djendTime,
- @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
+ @GetMapping ("/getOrderList")
+ @ApiOperation (value = "鏌ヨ浣撴璁板綍鍒楄〃")
+ public AjaxResult getOrderList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
+ @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+ @ApiParam (value = "浣撴鍙�)") @RequestParam (required = false) String tjNum,
+ @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
+ @ApiParam (value = "鐧昏寮�濮嬫椂闂�") @RequestParam (required = false) Date djbeginTime,
+ @ApiParam (value = "鐧昏缁撴潫鏃堕棿") @RequestParam (required = false) Date djendTime,
+ @ApiParam (value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam (required = false) Date bgbeginTime,
+ @ApiParam (value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam (required = false) Date bgendTime) {
Map<String, Object> map = new HashMap<>();
if (null != name) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
@@ -497,14 +497,14 @@
}
- @GetMapping("/getOrderListOO")
- @ApiOperation(value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃")
- public AjaxResult getOrderListOO(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
- @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
+ @GetMapping ("/getOrderListOO")
+ @ApiOperation (value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃")
+ public AjaxResult getOrderListOO(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
+ @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+ @ApiParam (value = "浣撴鍙�)") @RequestParam (required = false) String tjNum,
+ @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
+ @ApiParam (value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam (required = false) Date bgbeginTime,
+ @ApiParam (value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam (required = false) Date bgendTime) {
Map<String, Object> map = new HashMap<>();
if (null != name) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
@@ -626,15 +626,15 @@
}
- @GetMapping("/getPrintOrderList")
- @ApiOperation(value = "浣撴鍙戠エ鎵撳嵃鎺ュ彛")
- public AjaxResult getPrintOrderList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
- @ApiParam(value = "宸叉墦鍗版湭鎵撳嵃0鏈墦鍗�1宸叉墦鍗�)") @RequestParam(required = false) Integer type,
- @ApiParam(value = "濮撳悕") @RequestParam(required = false) String name,
- @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
+ @GetMapping ("/getPrintOrderList")
+ @ApiOperation (value = "浣撴鍙戠エ鎵撳嵃鎺ュ彛")
+ public AjaxResult getPrintOrderList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
+ @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+ @ApiParam (value = "浣撴鍙�)") @RequestParam (required = false) String tjNum,
+ @ApiParam (value = "宸叉墦鍗版湭鎵撳嵃0鏈墦鍗�1宸叉墦鍗�)") @RequestParam (required = false) Integer type,
+ @ApiParam (value = "濮撳悕") @RequestParam (required = false) String name,
+ @ApiParam (value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam (required = false) Date bgbeginTime,
+ @ApiParam (value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam (required = false) Date bgendTime) {
Map<String, Object> map = new HashMap<>();
List<TjOrder> collect = null;
if (null != name) {
@@ -825,9 +825,9 @@
* 瀵煎嚭浣撴璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:export')")
- @Log(title = "浣撴璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ApiOperation(value = "瀵煎嚭浣撴璁板綍鍒楄〃")
+ @Log (title = "浣撴璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping ("/export")
+ @ApiOperation (value = "瀵煎嚭浣撴璁板綍鍒楄〃")
public void export(HttpServletResponse response, TjOrder tjOrder) {
//List<TjOrder> list = tjOrderService.selectTjOrderList(tjOrder);
List<TjOrder> list = tjOrderService.selectExportOrderList(tjOrder);
@@ -839,15 +839,15 @@
* 鑾峰彇浣撴璁板綍璇︾粏淇℃伅
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:query')")
- @GetMapping(value = "/{orderId}")
- @ApiOperation(value = "鑾峰彇浣撴璁板綍璇︾粏淇℃伅")
- public AjaxResult getInfo(@PathVariable("orderId") Long orderId) {
+ @GetMapping (value = "/{orderId}")
+ @ApiOperation (value = "鑾峰彇浣撴璁板綍璇︾粏淇℃伅")
+ public AjaxResult getInfo(@PathVariable ("orderId") Long orderId) {
return success(tjOrderService.selectTjOrderByOrderId(orderId));
}
- @GetMapping("/getIsRequired")
- @ApiOperation(value = "鏍规嵁鍙傛暟閰嶇疆鑾峰彇鏄惁蹇呭～椤癸紙韬唤璇併�佹�у埆銆佺數璇濄�佺収鐗囥�佹槸鍚︾洿鎺ヤ笅鍗曪級")
+ @GetMapping ("/getIsRequired")
+ @ApiOperation (value = "鏍规嵁鍙傛暟閰嶇疆鑾峰彇鏄惁蹇呭～椤癸紙韬唤璇併�佹�у埆銆佺數璇濄�佺収鐗囥�佹槸鍚︾洿鎺ヤ笅鍗曪級")
public AjaxResult getIsRequired() {
Map<String, String> res = new HashMap<>();
res.put("has_idcard", configService.selectConfigByKey("has_idcard"));
@@ -863,7 +863,7 @@
* 浣撴绛惧埌鐧昏鎺ュ彛
*/
@PostMapping
- @ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
+ @ApiOperation (value = "浣撴绛惧埌鐧昏鎺ュ彛")
@Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
@@ -948,7 +948,7 @@
if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
tjOrder.setStatus(TjConstants.TJ_BEGIN);
tjOrder.setCardId(tjCustomer.getCardId());
- if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
tjOrder.setFinishTime(new Date());
tjOrder.setCheckStatus(1);
tjOrder.setStatus(TjConstants.TJ_WAIT);
@@ -1085,8 +1085,8 @@
}
- @PostMapping("/addPlOrderAndDetail")
- @ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
+ @PostMapping ("/addPlOrderAndDetail")
+ @ApiOperation (value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
@Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto, HttpServletResponse response) {
SysUser sysUser = UserHoder.getLoginUser().getUser();
@@ -1484,9 +1484,9 @@
* 淇敼浣撴璁板綍
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:edit')")
- @Log(title = "浣撴璁板綍", businessType = BusinessType.UPDATE)
+ @Log (title = "浣撴璁板綍", businessType = BusinessType.UPDATE)
@PutMapping
- @ApiOperation(value = "淇敼浣撴璁板綍")
+ @ApiOperation (value = "淇敼浣撴璁板綍")
public AjaxResult edit(@RequestBody TjOrder tjOrder) {
return toAjax(tjOrderService.updateTjOrder(tjOrder));
}
@@ -1495,16 +1495,16 @@
* 鍒犻櫎浣撴璁板綍
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:remove')")
- @Log(title = "浣撴璁板綍", businessType = BusinessType.DELETE)
- @DeleteMapping("/{orderIds}")
- @ApiOperation(value = "鍒犻櫎浣撴璁板綍")
+ @Log (title = "浣撴璁板綍", businessType = BusinessType.DELETE)
+ @DeleteMapping ("/{orderIds}")
+ @ApiOperation (value = "鍒犻櫎浣撴璁板綍")
public AjaxResult remove(@PathVariable Long[] orderIds) {
return toAjax(tjOrderService.deleteTjOrderByOrderIds(orderIds));
}
- @GetMapping("/getOrderDetailByTjNumber")
- @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栦綋妫�璇︽儏")
- public AjaxResult getOrderDetailByTjNumber(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+ @GetMapping ("/getOrderDetailByTjNumber")
+ @ApiOperation (value = "鏍规嵁浣撴鍙疯幏鍙栦綋妫�璇︽儏")
+ public AjaxResult getOrderDetailByTjNumber(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNumber) {
LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
wq0.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = tjOrderService.getOne(wq0);
@@ -1524,8 +1524,8 @@
return AjaxResult.success("鏆傛棤鏁版嵁");
}
- @PostMapping("/addtTransition")
- @ApiOperation(value = "娣诲姞杩囨浮琛ㄦ暟鎹�")
+ @PostMapping ("/addtTransition")
+ @ApiOperation (value = "娣诲姞杩囨浮琛ㄦ暟鎹�")
@Transactional
public AjaxResult addtTransition(@RequestBody Map<String, Object> map) {
Object packId = map.get("pacId");
@@ -1571,7 +1571,7 @@
// }
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
if (null != ppList && ppList.size() > 0) {
- transitionService.saveRedisTransitionByPacId(cusId,cardId ,pacId);
+ transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
//寮傛淇濆瓨鏁版嵁搴�
// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
// asyncService.saveRedisTransitionByPacId(cusId, cardId, pacId, null);
@@ -1622,10 +1622,10 @@
// asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds);
for (Long proId : proIds) {
TjProject project = projectService.selectTjProjectByProId(proId);
- if(null !=project){ //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))
+ if (null != project) { //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))
List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
if (null == transitionList || transitionList.size() == 0) {
- transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
+ transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
}
}
// if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
@@ -1691,9 +1691,9 @@
}
- @GetMapping("/getTransitionList")
- @ApiOperation(value = "鏌ヨ杩囨浮琛ㄦ暟鎹�")
- public AjaxResult getTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
+ @GetMapping ("/getTransitionList")
+ @ApiOperation (value = "鏌ヨ杩囨浮琛ㄦ暟鎹�")
+ public AjaxResult getTransitionList(@RequestParam @ApiParam (value = "瀹㈡埛id") String cusId) {
if (redisCache.hasKey(cusId + "cusId")) {
List<Map<String, Object>> list = redisCache.getCacheMapValue(cusId + "cusId", cusId);
return AjaxResult.success(list);
@@ -1708,16 +1708,16 @@
}
- @GetMapping("/getQianLiList")
- @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃")
- public AjaxResult getQianLiList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "浣撴鍙�") @RequestParam(required = false) String tjNum,
- @ApiParam(value = "濮撳悕") @RequestParam(required = false) String name,
- @ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam(required = false) Date djbeginTime,
- @ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam(required = false) Date djendTime,
- @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
+ @GetMapping ("/getQianLiList")
+ @ApiOperation (value = "鏌ヨ浣撴璁板綍鍒楄〃")
+ public AjaxResult getQianLiList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
+ @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+ @ApiParam (value = "浣撴鍙�") @RequestParam (required = false) String tjNum,
+ @ApiParam (value = "濮撳悕") @RequestParam (required = false) String name,
+ @ApiParam (value = "鐧昏寮�濮嬫椂闂�") @RequestParam (required = false) Date djbeginTime,
+ @ApiParam (value = "鐧昏缁撴潫鏃堕棿") @RequestParam (required = false) Date djendTime,
+ @ApiParam (value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam (required = false) Date bgbeginTime,
+ @ApiParam (value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam (required = false) Date bgendTime) {
Map<String, Object> map = new HashMap<>();
if (null != name) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
@@ -1826,9 +1826,9 @@
/**
* 绛剧寮冩纭杩斿洖鏁版嵁
*/
- @GetMapping("/abandon")
- @ApiOperation(value = "绛剧寮冩纭杩斿洖鏁版嵁")
- public AjaxResult abandon(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+ @GetMapping ("/abandon")
+ @ApiOperation (value = "绛剧寮冩纭杩斿洖鏁版嵁")
+ public AjaxResult abandon(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNumber) {
LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderRemark::getTjNumber, tjNumber);
List<TjOrderRemark> remarkList = remarkService.list(wq);
@@ -1853,8 +1853,8 @@
*
* @ApiParam(value = "浣撴鍙�") String tjNumber
*/
- @PostMapping("/tjGoOut")
- @ApiOperation(value = "浣撴绛剧")
+ @PostMapping ("/tjGoOut")
+ @ApiOperation (value = "浣撴绛剧")
@Transactional
public AjaxResult tjGoOut(@RequestBody Map<String, Object> map) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
@@ -1930,10 +1930,10 @@
/**
* 绛剧
*/
- @GetMapping("/goOut")
- @ApiOperation(value = "绛剧")
+ @GetMapping ("/goOut")
+ @ApiOperation (value = "绛剧")
@Transactional
- public AjaxResult goOut(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+ public AjaxResult goOut(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNumber) {
return getAjaxResult(tjNumber);
}
@@ -1941,9 +1941,9 @@
/**
* 鏍搁攢璁㈠崟鎺ュ彛
*/
- @GetMapping("/orderShip")
- @ApiOperation(value = "PC绔墜鍔ㄦ牳閿�璁㈠崟鎺ュ彛")
- public AjaxResult orderShip(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+ @GetMapping ("/orderShip")
+ @ApiOperation (value = "PC绔墜鍔ㄦ牳閿�璁㈠崟鎺ュ彛")
+ public AjaxResult orderShip(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNum) {
if (tjNum == null) {
return AjaxResult.error();
}
@@ -1994,7 +1994,7 @@
map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
- map.put("tjCategory",aPackage.getTjCategory());
+ map.put("tjCategory", aPackage.getTjCategory());
map.put("pacName", aPackage.getPacName());
TjProject tjProject = projectService.getById(entry.getKey());
// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
@@ -2007,7 +2007,7 @@
// }
map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
} else {
- map.put("tjCategory",null);
+ map.put("tjCategory", null);
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
if (null != tbTransitionList && tbTransitionList.size() > 0) {
@@ -2046,7 +2046,7 @@
map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
- map.put("tjCategory",aPackage.getTjCategory());
+ map.put("tjCategory", aPackage.getTjCategory());
map.put("pacName", aPackage.getPacName());
TjProject tjProject = projectService.getById(entry.getKey());
// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
@@ -2057,9 +2057,9 @@
// } else {
// map.put("nowPrice", tjProject.getProPrice());
// }
- map.put("nowPrice",tjProject.getProPrice());
+ map.put("nowPrice", tjProject.getProPrice());
} else {
- map.put("tjCategory",null);
+ map.put("tjCategory", null);
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
if (null != tbTransitionList && tbTransitionList.size() > 0) {
@@ -2110,15 +2110,15 @@
}
- @GetMapping("/tuanTiListById")
- @ApiOperation(value = "鏌ヨ鍥綋浣撴鐘舵��")
- public AjaxResult tuanTiListById(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
- @ApiParam(value = "鍗曚綅") @RequestParam String firmId,
- @ApiParam(value = "閮ㄩ棬") @RequestParam(required = false) String dwDeptId,
- @ApiParam(value = "鍒嗙粍") @RequestParam(required = false) String groupId,
- @ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam Date beginTime,
- @ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam Date endTime) {
+ @GetMapping ("/tuanTiListById")
+ @ApiOperation (value = "鏌ヨ鍥綋浣撴鐘舵��")
+ public AjaxResult tuanTiListById(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
+ @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
+ @ApiParam (value = "鍗曚綅") @RequestParam String firmId,
+ @ApiParam (value = "閮ㄩ棬") @RequestParam (required = false) String dwDeptId,
+ @ApiParam (value = "鍒嗙粍") @RequestParam (required = false) String groupId,
+ @ApiParam (value = "鐧昏寮�濮嬫椂闂�") @RequestParam Date beginTime,
+ @ApiParam (value = "鐧昏缁撴潫鏃堕棿") @RequestParam Date endTime) {
Map<String, Object> map = new HashMap<>();
int a = 0;
int b = 0;
@@ -2183,11 +2183,11 @@
}
- @GetMapping("/tuanTiBingById")
- @ApiOperation(value = "鏌ヨ鍥綋浣撴鐥呯璇︾粏淇℃伅")
- public AjaxResult tuanTiBingById(@ApiParam(value = "鍗曚綅") @RequestParam String firmId,
- @ApiParam(value = "閮ㄩ棬") @RequestParam String firmDeptId,
- @ApiParam(value = "鐥呯") @RequestParam(required = false) String bingZhong) {
+ @GetMapping ("/tuanTiBingById")
+ @ApiOperation (value = "鏌ヨ鍥綋浣撴鐥呯璇︾粏淇℃伅")
+ public AjaxResult tuanTiBingById(@ApiParam (value = "鍗曚綅") @RequestParam String firmId,
+ @ApiParam (value = "閮ㄩ棬") @RequestParam String firmDeptId,
+ @ApiParam (value = "鐥呯") @RequestParam (required = false) String bingZhong) {
List<TjOrderDetailRules> res1 = new ArrayList<>();
List<BingZhongVO> res = new ArrayList<>();
@@ -2246,8 +2246,8 @@
}
- @PostMapping("/tuanTiBingChart")
- @ApiOperation(value = "鏌ヨ鍥綋浣撴鐥呯缁熻鍥�")
+ @PostMapping ("/tuanTiBingChart")
+ @ApiOperation (value = "鏌ヨ鍥綋浣撴鐥呯缁熻鍥�")
public AjaxResult tuanTiBingChart(@RequestBody BingZhongVO bingZhongVO) {
List<TjOrderDetailRules> res1 = new ArrayList<>();
@@ -2286,90 +2286,90 @@
}
- @PostMapping("/deletedTbTransitionByCusId")
- @ApiOperation(value = "鏍规嵁韬唤璇佸彿鍒犻櫎涓存椂琛ㄦ暟鎹�")
- public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusId) {
+ @PostMapping ("/deletedTbTransitionByCusId")
+ @ApiOperation (value = "鏍规嵁韬唤璇佸彿鍒犻櫎涓存椂琛ㄦ暟鎹�")
+ public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam (value = "韬唤璇佸彿") String cusId) {
LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
wq.between(TbTransition::getCreateTime, transitionService.getTbTransitionCreateTimeByCusId(cusId), new Date());
wq.eq(TbTransition::getCusId, cusId);
return AjaxResult.success(transitionService.remove(wq));
}
- @GetMapping("/getTransitionInfo")
- @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�")
- public AjaxResult getTransitionInfo(@RequestParam("tjNumber")String tjNumber){
+ @GetMapping ("/getTransitionInfo")
+ @ApiOperation (value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�")
+ public AjaxResult getTransitionInfo(@RequestParam ("tjNumber") String tjNumber) {
QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
- wrapper.select("parent_pro_id","parent_pro_name","sum(ord_price) as ord_price")
- .eq("tj_num",tjNumber)
+ wrapper.select("parent_pro_id", "parent_pro_name", "sum(ord_price) as ord_price")
+ .eq("tj_num", tjNumber)
.groupBy("parent_pro_name");
List<TbTransition> list = transitionService.list(wrapper);
List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList());
LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>();
- projectQueryWrapper.in(TjProject::getProId,parentProIds);
+ projectQueryWrapper.in(TjProject::getProId, parentProIds);
List<TjProject> projects = projectService.list(projectQueryWrapper);
JSONArray huiZong = JSONUtil.createArray();
int index = 1;
for (TjProject project : projects) {
LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SysDept::getDeptId,project.getDeptId());
+ queryWrapper.eq(SysDept::getDeptId, project.getDeptId());
SysDept dept = sysDeptService.getOne(queryWrapper);
for (TbTransition tbTransition : list) {
- if (tbTransition.getParentProId().toString().equals(project.getProId().toString())){
+ if (tbTransition.getParentProId().toString().equals(project.getProId().toString())) {
JSONObject obj = JSONUtil.createObj();
- obj.putOpt("index",index++);
- obj.putOpt("parent_pro_name",tbTransition.getParentProName());
- obj.putOpt("price",tbTransition.getOrdPrice());
- obj.putOpt("ks",dept.getDeptName());
+ obj.putOpt("index", index++);
+ obj.putOpt("parent_pro_name", tbTransition.getParentProName());
+ obj.putOpt("price", tbTransition.getOrdPrice());
+ obj.putOpt("ks", dept.getDeptName());
huiZong.add(obj);
}
}
}
wrapper = new QueryWrapper<>();
- wrapper.eq("tj_num",tjNumber);
+ wrapper.eq("tj_num", tjNumber);
list = transitionService.list(wrapper);
JSONArray info = JSONUtil.createArray();
index = 1;
for (TbTransition tbTransition : list) {
JSONObject obj = JSONUtil.createObj();
- obj.putOpt("index",index++);
- obj.putOpt("parent_pro_name",tbTransition.getParentProName());
- obj.putOpt("pro_name",tbTransition.getProName());
+ obj.putOpt("index", index++);
+ obj.putOpt("parent_pro_name", tbTransition.getParentProName());
+ obj.putOpt("pro_name", tbTransition.getProName());
BigDecimal ordPrice = tbTransition.getOrdPrice();
- obj.putOpt("zongjia",ordPrice);
+ obj.putOpt("zongjia", ordPrice);
QueryWrapper<TjProject> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("pro_id",tbTransition.getProId());
+ queryWrapper.eq("pro_id", tbTransition.getProId());
TjProject tjProject = projectService.getOne(queryWrapper);
Integer num = tjProject.getSl();
- obj.putOpt("num",num);
+ obj.putOpt("num", num);
BigDecimal price = ordPrice.divide(new BigDecimal(num));
- obj.putOpt("danjia",price);
+ obj.putOpt("danjia", price);
Date createTime = tbTransition.getCreateTime();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- obj.putOpt("time",dateFormat.format(createTime));
+ obj.putOpt("time", dateFormat.format(createTime));
info.put(obj);
}
HashMap<String, Object> map = new HashMap<>();
- map.put("huizong",huiZong);
- map.put("info",info);
- return AjaxResult.success().put("data",map);
+ map.put("huizong", huiZong);
+ map.put("info", info);
+ return AjaxResult.success().put("data", map);
}
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
- if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
- tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- }else {
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- }
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ } else {
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ }
tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
//淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
//娣诲姞remark琛ㄦ暟鎹�
- if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
- }else {
+ } else {
remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
}
@@ -2393,8 +2393,8 @@
}
- @PostMapping("/heXiaoByIds/{orderIds}")
- @ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
+ @PostMapping ("/heXiaoByIds/{orderIds}")
+ @ApiOperation (value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
@Transactional
public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
for (String orderId : orderIds) {
@@ -2410,8 +2410,8 @@
return AjaxResult.success("鏍告敹鎴愬姛");
}
- @GetMapping("/getHistryTjOrderByCusIdCard")
- @ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴璁板綍")
+ @GetMapping ("/getHistryTjOrderByCusIdCard")
+ @ApiOperation (value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴璁板綍")
@Transactional
public AjaxResult getHistryTjOrderByCusIdCard(@RequestParam String cusIdCard) {
TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
@@ -2431,8 +2431,8 @@
}
- @GetMapping("/getHistryTjOrderProByCusIdCard")
- @ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴椤圭洰璁板綍")
+ @GetMapping ("/getHistryTjOrderProByCusIdCard")
+ @ApiOperation (value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴椤圭洰璁板綍")
@Transactional
public AjaxResult getHistryTjOrderProByCusIdCard(@RequestParam String cusIdCard) {
TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
@@ -2491,8 +2491,8 @@
}
- @GetMapping("/getHistryTjOrderByCusId")
- @ApiOperation(value = "鏍规嵁瀹㈡埛id鏌ョ湅鍘嗗彶浣撴璁板綍")
+ @GetMapping ("/getHistryTjOrderByCusId")
+ @ApiOperation (value = "鏍规嵁瀹㈡埛id鏌ョ湅鍘嗗彶浣撴璁板綍")
@Transactional
public AjaxResult getHistryTjOrderByCusId(@RequestParam String cusId) {
TjCustomer tjCustomer = tjCustomerService.getById(cusId);
@@ -2526,10 +2526,10 @@
}
- @GetMapping("/revokeTjOrderByTjNum")
- @ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋挙閿�浣撴璁板綍")
+ @GetMapping ("/revokeTjOrderByTjNum")
+ @ApiOperation (value = "鏍规嵁瀹㈡埛浣撴鍙锋挙閿�浣撴璁板綍")
@Transactional
- public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+ public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNum) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
@@ -2544,15 +2544,14 @@
transitionService.deletedTbTransitionByTjNum(tjNum);
TjCustomer customer = tjCustomerService.getById(order.getUserId());
- if (null != customer) {
- customer.setCardId("0");
- tjCustomerService.updateById(customer);
- }
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
if (configByKey.equals("Y")) {
HashMap<String, Object> map = new HashMap<>();
map.put("cardtype", "4");
- map.put("input", order.getCardId());
+// map.put("input", order.getCardId());
+ map.put("input", customer.getPationId());
LocalDate currentDate = LocalDate.now();
LocalDateTime startOfDay = currentDate.atStartOfDay();
LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
@@ -2564,7 +2563,7 @@
AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
+ return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
} else {
boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
if (zfHisApiMethods) {
@@ -2575,22 +2574,20 @@
}
}
}
-
-// transitionService.updateTbTransitionByTjNum(tjNum);
return AjaxResult.success("鎾ら攢鎴愬姛!!!");
}
return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
}
- @GetMapping("/getCusTomterListByCompId")
- @ApiOperation(value = "鑾峰彇鍗曚綅id浣撴浜轰俊鎭帴鍙�")
- public AjaxResult getCusTomterListByCompId(@RequestParam(required = false) @ApiParam(value = "鍗曚綅id") String compId,
- @RequestParam(required = false) @ApiParam(value = "鍚嶅瓧") String name,
- @RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId,
- @RequestParam(required = false) @ApiParam(value = "棰勭害鏃堕棿") Date reservationTime,
- @RequestParam(defaultValue = "1") Integer page,
- @RequestParam(defaultValue = "10") Integer pageSize) {
+ @GetMapping ("/getCusTomterListByCompId")
+ @ApiOperation (value = "鑾峰彇鍗曚綅id浣撴浜轰俊鎭帴鍙�")
+ public AjaxResult getCusTomterListByCompId(@RequestParam (required = false) @ApiParam (value = "鍗曚綅id") String compId,
+ @RequestParam (required = false) @ApiParam (value = "鍚嶅瓧") String name,
+ @RequestParam (required = false) @ApiParam (value = "閮ㄩ棬id") String deptId,
+ @RequestParam (required = false) @ApiParam (value = "棰勭害鏃堕棿") Date reservationTime,
+ @RequestParam (defaultValue = "1") Integer page,
+ @RequestParam (defaultValue = "10") Integer pageSize) {
Page<TjReservation> pages = new Page<>(page, pageSize);
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
if (null != compId) wq.eq(TjReservation::getCompanyId, compId);
@@ -2616,10 +2613,10 @@
}
- @PostMapping("/plRevokeTjOrderByTjNum")
- @ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
+ @PostMapping ("/plRevokeTjOrderByTjNum")
+ @ApiOperation (value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
@Transactional
- public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam(value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
+ public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam (value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
if (null != reservationIds && reservationIds.size() > 0) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.in(TjOrder::getReservationId, reservationIds);
@@ -2653,8 +2650,8 @@
return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勪汉鍛�!");
}
- @PostMapping("makeTjPDF")
- @ApiOperation(value = "鎵归噺鐢熸垚PDF")
+ @PostMapping ("makeTjPDF")
+ @ApiOperation (value = "鎵归噺鐢熸垚PDF")
public AjaxResult makeTjPDF(@RequestBody List<String> reservations) {
QueryWrapper<TjOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.in("reservation_id", reservations);
@@ -2696,11 +2693,11 @@
}
- @GetMapping("/delTbBycusCardIdAndProId")
- @ApiOperation(value = "鏍规嵁瀹㈡埛韬唤璇佸彿鍜岄」鐩埗椤筰d鍒犻櫎涓存椂琛ㄦ暟鎹�")
+ @GetMapping ("/delTbBycusCardIdAndProId")
+ @ApiOperation (value = "鏍规嵁瀹㈡埛韬唤璇佸彿鍜岄」鐩埗椤筰d鍒犻櫎涓存椂琛ㄦ暟鎹�")
@Transactional
- public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusCardId,
- @RequestParam @ApiParam(value = "鐖堕」id") String proId) {
+ public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam (value = "韬唤璇佸彿") String cusCardId,
+ @RequestParam @ApiParam (value = "鐖堕」id") String proId) {
if (transitionService.delTbBycusCardIdAndProId(cusCardId, proId)) {
return AjaxResult.success();
@@ -2709,10 +2706,10 @@
}
- @GetMapping("/revokeTjOrderByTjCardId")
- @ApiOperation(value = "鏍规嵁灏辫瘖鍙锋挙閿�鐢宠璁板綍")
+ @GetMapping ("/revokeTjOrderByTjCardId")
+ @ApiOperation (value = "鏍规嵁灏辫瘖鍙锋挙閿�鐢宠璁板綍")
@Transactional
- public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String cardId) {
+ public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam (value = "灏辫瘖鍙�") String cardId) {
TjOrder order = new TjOrder();
order.setCardId(cardId);
@@ -2747,10 +2744,10 @@
}
- @GetMapping("/revokeTjOrderByTjh")
- @ApiOperation(value = "鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
+ @GetMapping ("/revokeTjOrderByTjh")
+ @ApiOperation (value = "鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
@Transactional
- public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+ public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNum) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
@@ -2768,25 +2765,25 @@
}
- @GetMapping("/getBlproByTjh")
- @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栬ˉ褰曢」鐩褰�")
+ @GetMapping ("/getBlproByTjh")
+ @ApiOperation (value = "鏍规嵁浣撴鍙疯幏鍙栬ˉ褰曢」鐩褰�")
@Transactional
- public AjaxResult getBlproByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+ public AjaxResult getBlproByTjh(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNum) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
- LambdaQueryWrapper<TjProBl> wq=new LambdaQueryWrapper<>();
- wq.eq(TjProBl::getTjh,tjNum);
+ LambdaQueryWrapper<TjProBl> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProBl::getTjh, tjNum);
List<TjProBl> blList = blService.list(wq);
- if(null !=blList && blList.size()>0){
+ if (null != blList && blList.size() > 0) {
for (TjProBl bl : blList) {
- LambdaQueryWrapper<TjOrderRemark>wqr=new LambdaQueryWrapper<>();
- wqr.eq(TjOrderRemark::getJxbz,bl.getBldh());
+ LambdaQueryWrapper<TjOrderRemark> wqr = new LambdaQueryWrapper<>();
+ wqr.eq(TjOrderRemark::getJxbz, bl.getBldh());
List<TjOrderRemark> remarkList = remarkService.list(wqr);
- if(null !=remarkList && remarkList.size()>0){
+ if (null != remarkList && remarkList.size() > 0) {
List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
- LambdaQueryWrapper<TjProject> wqp=new LambdaQueryWrapper<>();
- wqp.in(TjProject::getProId,collect);
+ LambdaQueryWrapper<TjProject> wqp = new LambdaQueryWrapper<>();
+ wqp.in(TjProject::getProId, collect);
List<TjProject> projectList = projectService.list(wqp);
for (TjProject project : projectList) {
project.setChildren(projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())));
@@ -2802,44 +2799,43 @@
}
-
- @PostMapping("/revokeBlProByBldhAndTjh")
- @ApiOperation(value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
+ @PostMapping ("/revokeBlProByBldhAndTjh")
+ @ApiOperation (value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
@Transactional
public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {
- if(null ==dto.getBldhs() || dto.getBldhs().size()==0){
+ if (null == dto.getBldhs() || dto.getBldhs().size() == 0) {
return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
}
TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh());
if (null != order) {
String configByKey = configService.selectConfigByKey("sfkqdyhis");
- if(null !=configByKey && configByKey.equals("Y")){
+ if (null != configByKey && configByKey.equals("Y")) {
HashMap<String, Object> hisRequestParams = new HashMap<>();
- hisRequestParams.put("patientId",order.getCardId());
+ hisRequestParams.put("patientId", order.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");
BigDecimal cateFeeAll = BigDecimal.ZERO;
- List<String> advIds=new ArrayList<>();
+ List<String> advIds = new ArrayList<>();
for (Map<String, String> datum : data) {
String advId = datum.get("Adv_Id").split("_")[1];
BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
cateFeeAll = cateFeeAll.add(cateFee);
advIds.add(advId);
}
- if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO)!=0 ){
+ if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
}
}
}
for (String bldh : dto.getBldhs()) {
- remarkService.deleteTjOrderDetailByjxbz(bldh);
+ remarkService.deleteTjOrderDetailByjxbz(bldh);
tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
transitionService.deleteTjOrderDetailByjxbz(bldh);
- blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh,dto.getTjh()).eq(TjProBl::getBldh,bldh));
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh));
}
return AjaxResult.success();
}
@@ -2847,25 +2843,19 @@
}
- @PostMapping("/addYaoPinShenQing")
- @ApiOperation(value = "鑽搧淇℃伅鐢宠")
+ @PostMapping ("/addYaoPinShenQing")
+ @ApiOperation (value = "鑽搧淇℃伅鐢宠")
@Transactional
- public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto){
+ 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")){
+ if (null != code && code.equals("200")) {
}
return AjaxResult.success();
}
-
-
-
-
-
-
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
index f403ddf..0d98f38 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
@@ -26,6 +26,6 @@
@Select ("SELECT a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='妫�鏌�' GROUP BY a.sqdh")
List<String> getJianJcBaoGaoDan(String cardId);
- @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tmh=#{tmh}")
+ @Select("SELECT * FROM ltkj_exam_jcbgd WHERE tmh=#{tmh} GROUP BY xmmc ")
List<LtkjExamJcbgd> getJianJcBaoGaoDanList(String tmh);
}
--
Gitblit v1.8.0