From b7398498c803b88de13d6f905023911312b3fc45 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 11 十二月 2024 22:47:45 +0800
Subject: [PATCH] 2024-12-11
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java | 4
ltkj-admin/src/main/java/com/ltkj/web/config/pdfutils/PdfUtils.java | 85 ----------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java | 5
ltkj-admin/src/main/resources/logback.xml | 4
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java | 6
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 1
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 5
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 348 ++++++++++++++++++++++++++++++++++++++-----
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 5
14 files changed, 341 insertions(+), 135 deletions(-)
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 4292991..824b161 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
@@ -221,46 +221,6 @@
cell.setBorder(Rectangle.NO_BORDER);
cell.setColspan(3);
table.addCell(cell);
- }else {
- PdfPCell cell = new PdfPCell();
- // 姘村钩銆佸瀭鐩村眳涓�
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_LEFT);
- cell.setPhrase(new Phrase("妫�鏌ユ墍瑙侊細", textFont));
- // 璁剧疆鏃犺竟妗�
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setColspan(3);
- table.addCell(cell);
-
- cell = new PdfPCell();
- // 姘村钩銆佸瀭鐩村眳涓�
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_LEFT);
- cell.setPhrase(new Phrase(tjPdfVO.getProResult(), textFont));
- // 璁剧疆鏃犺竟妗�
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setColspan(3);
- table.addCell(cell);
-
- cell = new PdfPCell();
- // 姘村钩銆佸瀭鐩村眳涓�
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_LEFT);
- cell.setPhrase(new Phrase("缁撹锛�", textFont));
- // 璁剧疆鏃犺竟妗�
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setColspan(3);
- table.addCell(cell);
-
- cell = new PdfPCell();
- // 姘村钩銆佸瀭鐩村眳涓�
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_LEFT);
- cell.setPhrase(new Phrase(tjPdfVO.getProResult(), textFont));
- // 璁剧疆鏃犺竟妗�
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setColspan(3);
- table.addCell(cell);
}
}
return table;
@@ -301,9 +261,10 @@
* @param list
* @return
*/
- public static PdfPTable setTable2(Font headFont, Font textFont, String[] title, List<TjPdfVO> list,boolean flag) {
+ public static PdfPTable setTable2(Font headFont, Font textFont, String[] title, List<TjPdfVO> list,boolean flag,float[] titleWidth) {
//鍥涘垪
- PdfPTable table = createTable(new float[]{240, 240,240});
+ PdfPTable table = createTable(titleWidth);
+// PdfPTable table = createTable(new float[]{240, 240,240});
//鐢绘爣棰�
for (String head : title) {
table.addCell(createCell(head, headFont));
@@ -349,46 +310,6 @@
cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
cell.setHorizontalAlignment(Element.ALIGN_LEFT);
cell.setPhrase(new Phrase(tjPdfVO.getTs(), textFont));
- // 璁剧疆鏃犺竟妗�
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setColspan(3);
- table.addCell(cell);
- }else {
- PdfPCell cell = new PdfPCell();
- // 姘村钩銆佸瀭鐩村眳涓�
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_LEFT);
- cell.setPhrase(new Phrase("妫�鏌ユ墍瑙侊細", textFont));
- // 璁剧疆鏃犺竟妗�
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setColspan(3);
- table.addCell(cell);
-
- cell = new PdfPCell();
- // 姘村钩銆佸瀭鐩村眳涓�
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_LEFT);
- cell.setPhrase(new Phrase(tjPdfVO.getProResult(), textFont));
- // 璁剧疆鏃犺竟妗�
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setColspan(3);
- table.addCell(cell);
-
- cell = new PdfPCell();
- // 姘村钩銆佸瀭鐩村眳涓�
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_LEFT);
- cell.setPhrase(new Phrase("缁撹锛�", textFont));
- // 璁剧疆鏃犺竟妗�
- cell.setBorder(Rectangle.NO_BORDER);
- cell.setColspan(3);
- table.addCell(cell);
-
- cell = new PdfPCell();
- // 姘村钩銆佸瀭鐩村眳涓�
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_LEFT);
- cell.setPhrase(new Phrase(tjPdfVO.getProResult(), textFont));
// 璁剧疆鏃犺竟妗�
cell.setBorder(Rectangle.NO_BORDER);
cell.setColspan(3);
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 183ec38..ad4efb3 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
@@ -18,6 +18,9 @@
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.DictUserInfoMapper;
+import com.ltkj.hosp.mapper.TjOrderDetailMapper;
+import com.ltkj.hosp.mapper.TjOrderRemarkMapper;
+import com.ltkj.hosp.mapper.TjRulesMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
@@ -98,6 +101,14 @@
private IDictHospService dictHospService;
@Autowired
private ISysDictDataService sysDictDataService;
+ @Autowired
+ private ITjRulesService tjRulesService;
+ @Autowired
+ private TjRulesMapper tjRulesMapper;
+ @Autowired
+ private TjOrderRemarkMapper tjOrderRemarkMapper;
+ @Autowired
+ private TjOrderDetailMapper tjOrderDetailMapper;
private Integer pdfPage = 0;
@@ -168,7 +179,7 @@
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document1, printReport,dictHosp,color);
+ notHuaYanTable(document1, printReport,dictHosp,color,false);
} catch (DocumentException e) {
log.error("闈炲寲楠岄」鐩～鍏呰〃鏍煎紓甯�");
log.error(String.valueOf(e));
@@ -181,7 +192,7 @@
printReport = new HashMap<>();
pacsJianChaData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document1, printReport,dictHosp,color);
+ notHuaYanTable(document1, printReport,dictHosp,color,true);
} catch (DocumentException e) {
log.error("pacs椤圭洰濉厖琛ㄦ牸寮傚父");
log.error(String.valueOf(e));
@@ -192,7 +203,7 @@
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document1, printReport,dictHosp,color);
+ notHuaYanTable(document1, printReport,dictHosp,color,true);
} catch (DocumentException e) {
log.error("闈炲寲楠岄」鐩～鍏呰〃鏍煎紓甯�");
log.error(String.valueOf(e));
@@ -371,16 +382,98 @@
document2.add(paragraph);
isXmWrite = true;
}
- String content = " ("+index + ") " + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4);
+ String content = " ("+index + ") " + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
paragraph = new Paragraph(content,defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
+ // 绗叚浣嶆槸lis椤圭洰id
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getLisXmbm,i.get(5));
+// TjProject project = projectService.getOne(wrapper);
+// if (project != null) {
+// LambdaQueryWrapper<TjRules> queryWrapper = new LambdaQueryWrapper<>();
+// queryWrapper.eq(TjRules::getProId,project.getProId());
+// List<TjRules> rules = tjRulesService.list(queryWrapper);
+// if (!rules.isEmpty()){
+//
+// }
+ String str = " ";
+ List<Map<String, Object>> maps = tjRulesMapper.getyichangxiangmujianyiguize(i.get(5),null,i.get(2));
+ if (!maps.isEmpty()){
+ for (Map<String, Object> objectMap : maps) {
+// paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// document2.add(paragraph);
+//
+// paragraph = new Paragraph(str+objectMap.get("bt").toString(),defaultFont);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// document2.add(paragraph);
+//
+// paragraph = new Paragraph(str+"寤鸿鍐呭",defaultFont);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// document2.add(paragraph);
+//
+// paragraph = new Paragraph(str+objectMap.get("nr").toString(),defaultFont);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// document2.add(paragraph);
+
+ paragraph = new Paragraph(str+objectMap.get("bt").toString()+"锛�"+objectMap.get("nr").toString(),defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ }
+// }
index++;
}
}
paragraph = PdfUtils.setParagraph(defaultFont, "");
document2.add(paragraph);
}
+
+
+// List<TjOrderRemark> remarks = tjOrderRemarkMapper.getzongjianyishengchakanyichangxiangmu3( tjOrder.getTjNumber());
+ List<TjOrderDetail> orderDetails = tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu4( tjOrder.getTjNumber());
+// List<Map<String, Object>> jiancha = new ArrayList<>();
+
+ for (Map.Entry<Long, List<TjOrderDetail>> entry : orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId)).entrySet()) {
+ List<TjOrderDetail> details = entry.getValue();
+ String xmmc = details.get(0).getProName();
+ boolean isXmWrite = false;
+ int index = 1;
+ for (TjOrderDetail detail : details) {
+ if (!isXmWrite) {
+ paragraph = new Paragraph(xmmc,defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ isXmWrite = true;
+ }
+ String result = detail.getProResult();
+ if (StrUtil.isNotBlank(result)){
+ result = result.replaceAll("\n鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�","");
+ result = "\n "+result.replaceAll("\n","\n ");
+ }
+ String content = " ("+index + ") " + detail.getProName() + "锛�" + result;
+ paragraph = new Paragraph(content,defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ String str = " ";
+ List<Map<String, Object>> advices = detail.getAdvices();
+ if (advices != null && !advices.isEmpty()){
+ for (Map<String, Object> m : advices) {
+ paragraph = new Paragraph(str+m.get("bt").toString()+"锛�"+m.get("nr").toString(),defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ }
+ index++;
+ }
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ document2.add(paragraph);
+ }
+
+
+
+
for (int i = 0; i < 2; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -424,7 +517,7 @@
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document, printReport, dictHosp, color);
+ notHuaYanTable(document, printReport, dictHosp, color,false);
} catch (DocumentException e) {
log.error("闈炲寲楠岄」鐩～鍏呰〃鏍煎紓甯�");
log.error(String.valueOf(e));
@@ -436,7 +529,7 @@
printReport = new HashMap<>();
pacsJianChaData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document, printReport, dictHosp, color);
+ notHuaYanTable(document, printReport, dictHosp, color,true);
} catch (DocumentException e) {
log.error("pacs椤圭洰濉厖琛ㄦ牸寮傚父");
log.error(String.valueOf(e));
@@ -839,7 +932,7 @@
* @param printReport
* @throws DocumentException
*/
- private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport,DictHosp dictHosp,String colorStr) throws DocumentException {
+ private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport,DictHosp dictHosp,String colorStr,boolean isPacs) throws DocumentException {
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjProject::getProId, entry.getKey().getProId());
@@ -885,31 +978,114 @@
if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") && !value.isEmpty()){
if (value.size()>1){
- String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
- Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
- document1.add(table);
+ if (value.get(0).getPid().equals("1862852701533012001")){
+ Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph("DOB鍊硷細 鈮� 4.0 HP-闃虫��", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph(" < 4.0 姝ｅ父", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+
+ ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB="+value.get(0).getProResult(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph("", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ ppp = new Paragraph("", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ ppp = new Paragraph("缁撹锛�"+entry.getKey().getRemark(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }else {
+ String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
+ Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,isPacs,new float[]{240, 240,240});
+ document1.add(table);
+ }
}else {
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
- document1.add(pp);
- Paragraph ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
- pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
- document1.add(pp);
- ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+
+ if (isPacs){
+ Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ document1.add(pp);
+ Paragraph ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
+ document1.add(pp);
+ ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }else {
+ if (value.get(0).getPid().equals("1862852701533012001")){
+ remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph("DOB鍊硷細 鈮� 4.0 HP-闃虫��", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph(" < 4.0 姝ｅ父", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+
+ ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB="+value.get(0).getProResult(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph("", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ ppp = new Paragraph("", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ ppp = new Paragraph("缁撹锛�"+entry.getKey().getRemark(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }else {
+ String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
+ Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,false,new float[]{240, 300});
+ document1.add(table);
+ }
+ }
}
}else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,isPacs,new float[]{240, 240,240});
document1.add(table);
}
//鍒ゆ柇澶囨敞鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
@@ -984,31 +1160,116 @@
if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") && !value.isEmpty()){
if (value.size()>1){
- String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
- Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
- document1.add(table);
+ if (value.get(0).getPid().equals("1862852701533012001")){
+ Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph("DOB鍊硷細 鈮� 4.0 HP-闃虫��", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph(" < 4.0 姝ｅ父", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+
+ ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB="+value.get(0).getProResult(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph("", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ ppp = new Paragraph("", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ ppp = new Paragraph("缁撹锛�"+entry.getKey().getRemark(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }else {
+ String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
+ Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,isPacs,new float[]{240, 240,240});
+ document1.add(table);
+ }
+
}else {
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
- document1.add(pp);
- Paragraph ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
- pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
- document1.add(pp);
- ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- paragraph.setLeading(5f);
- document1.add(ppp);
+
+ if (isPacs){
+ Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
+ document1.add(pp);
+ Paragraph ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ pp = PdfUtils.setParagraph(remarkFonts, "缁撹锛�");
+ document1.add(pp);
+ ppp = new Paragraph(value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }else {
+ if (value.get(0).getPid().equals("1862852701533012001")){
+ remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph("DOB鍊硷細 鈮� 4.0 HP-闃虫��", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph(" < 4.0 姝ｅ父", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+
+ ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB="+value.get(0).getProResult(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+
+ ppp = new Paragraph("", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ ppp = new Paragraph("", remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ ppp = new Paragraph("缁撹锛�"+entry.getKey().getRemark(), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
+ }else {
+ String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
+ Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,false,new float[]{240, 300});
+ document1.add(table);
+ }
+ }
+
}
}else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value,dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌"));
+ PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value,isPacs);
document1.add(table);
}
@@ -1418,6 +1679,7 @@
tjPdfVO.setCompany("/");
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
+ tjPdfVO.setPid(String.valueOf(tjProject.getProParentId()));
LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LtkjExamJcbgd::getTjh,tjNumber);
wrapper.eq(LtkjExamJcbgd::getXmdm,String.valueOf(tjOrderDetail.getProject().getProParentId()));
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 472fb96..20ee064 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
@@ -1641,7 +1641,7 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
- List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),tjOrderDetail.getYcbz());
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),null,tjOrderDetail.getYcbz());
if(null !=maps && !maps.isEmpty()){
tjOrderDetail.setAdvices(maps);
}
@@ -1668,7 +1668,7 @@
@ApiOperation (value = "鎬绘鏌ョ湅寮傚父椤圭洰寤鸿瑙勫垯鎺ュ彛")
public AjaxResult getyichangxiangmujianyiguize(@RequestParam String proId,@RequestParam String ycbz) {
if (StrUtil.isNotBlank(proId) && StrUtil.isNotBlank(ycbz)) {
- List<Map<String,Object>> map= rulesService.getyichangxiangmujianyiguize(proId,ycbz);
+ List<Map<String,Object>> map= rulesService.getyichangxiangmujianyiguize(proId,null,ycbz);
return AjaxResult.success(map);
}
return AjaxResult.error();
diff --git a/ltkj-admin/src/main/resources/logback.xml b/ltkj-admin/src/main/resources/logback.xml
index 09fcd19..803e10f 100644
--- a/ltkj-admin/src/main/resources/logback.xml
+++ b/ltkj-admin/src/main/resources/logback.xml
@@ -15,11 +15,11 @@
<!-- 鏃ュ織瀛樻斁璺緞 linux鐜-->
<springProfile name="linux-prod">
- <property name="log.path" value="logs"/>
+ <property name="log.path" value="/ltkj/jar/logs"/>
</springProfile>
<springProfile name="linux-test">
- <property name="log.path" value="logs/ceshi"/>
+ <property name="log.path" value="/ltkj/jar/logs/ceshi"/>
</springProfile>
<!-- 鏃ュ織杈撳嚭鏍煎紡 -->
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java
index 630b2bd..500d498 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPdfVO.java
@@ -43,4 +43,9 @@
* 瀹℃牳鍖诲笀
*/
private String shys;
+
+ /**
+ * 纰�13id
+ */
+ private String pid;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
index 0aa4c5d..e406c81 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -251,4 +251,7 @@
@Select("call tj_check_yclist(1,#{tjnumber,mode=IN})")
List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber);
+
+ @Select("call tj_check_yclist(4,#{tjNumber,mode=IN})")
+ List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu4(@Param("tjNumber") String tjNumber);
}
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 4361813..d948703 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
@@ -181,6 +181,9 @@
@Select("call tj_check_yclist(0,#{tjnumber,mode=IN})")
List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber);
+ @Select("call tj_check_yclist(3,#{tjNumber,mode=IN})")
+ List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu3(@Param("tjNumber") String tjNumber);
+
void tjYishengjianchajianyi(Map<String,Object> map);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
index 86fa268..88480db 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
@@ -76,7 +76,7 @@
@Select("SELECT a.advice_bt bt, a.advice_nr nr FROM tj_rules a JOIN tj_project b ON b.pro_id=a.pro_id\n" +
- "\n" +
- "WHERE b.lis_xmbm=#{proId} AND a.sign=#{ycbz}")
- List<Map<String,Object>> getyichangxiangmujianyiguize(@Param("proId") String proId,@Param("ycbz") String ycbz);
+ " \n" +
+ " WHERE (b.lis_xmbm= #{xmbm} OR a.pro_id=#{proId}) AND a.sign= #{ycbz}")
+ List<Map<String,Object>> getyichangxiangmujianyiguize(@Param("xmbm") String xmbm,@Param("proId") String proId,@Param("ycbz") String ycbz);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
index a640aae..efc562c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -124,4 +124,5 @@
List<TjOrderDetail> getCaiYangDengJiJxbz(Long orderId,String jxbz);
List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber);
+ List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(int num,String tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index 65862a4..fc9d80e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -69,6 +69,7 @@
List<TjOrderRemark> notHuaYanData(String tjnumber);
List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber);
+ List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(int num,String tjNumber);
List<TjOrderRemark> pacsJianChaData(String tjnumber);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java
index 279768c..3cdb7b5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjRulesService.java
@@ -20,5 +20,5 @@
List<TjRules> getTjRulesListByTjNumAndProId(String tjNum,Long proId);
- List<Map<String,Object>> getyichangxiangmujianyiguize(String proId, String ycbz);
+ List<Map<String,Object>> getyichangxiangmujianyiguize(String xmbm,String proId, String ycbz);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index 849ebca..f2ae3fc 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -203,6 +203,11 @@
}
@Override
+ public List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(int num, String tjNumber) {
+ return tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ }
+
+ @Override
public List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber) {
return tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu(tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 27cf338..7604069 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -121,6 +121,11 @@
}
@Override
+ public List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(int num, String tjNumber) {
+ return mapper.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ }
+
+ @Override
public List<TjOrderRemark> getzongjianyishengchakanyichangxiangmu(String tjNumber) {
return mapper.getzongjianyishengchakanyichangxiangmu(tjNumber);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
index 8cfc723..721832e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
@@ -39,7 +39,7 @@
}
@Override
- public List<Map<String,Object>> getyichangxiangmujianyiguize(String proId, String ycbz) {
- return mapper.getyichangxiangmujianyiguize(proId,ycbz);
+ public List<Map<String,Object>> getyichangxiangmujianyiguize(String xmbm,String proId, String ycbz) {
+ return mapper.getyichangxiangmujianyiguize(xmbm,proId,ycbz);
}
}
--
Gitblit v1.8.0