添加影像检查

eitc-admin/src/main/resources/templates/medical-record.html

@@ -160,6 +160,10 @@ lang=EN-US style='font-size:18.0pt;line-height:150%'>${companyName}</span></b></
   <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.inspectContent!}</span></p></td>
  </tr>
  <tr>
+  <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>影像检查：</span></p></td>
+  <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.imageInspectContent!}</span></p></td>
+ </tr>
+ <tr>
   <td width=111 valign=top style='width:83.3pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal style='text-align:justify;text-justify:distribute-all-lines'><span style='font-family:宋体'>诊断：</span></p></td>
   <td width=602 valign=top style='width:451.35pt;padding:0cm 5.4pt 0cm 5.4pt'><p class=MsoNormal><span lang=EN-US>${patient.diagnosisContent!}</span></p></td>
  </tr>

eitc-common/src/main/java/com/eitc/common/filter/CustomResponseBodyAdviceAdapter.java

@@ -32,23 +32,23 @@ public class CustomResponseBodyAdviceAdapter implements ResponseBodyAdvice<Objec
     @Override
     public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
                                   Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
-        if (body instanceof AjaxResult) {
-            AjaxResult ajaxResult = (AjaxResult) body;
-            try {
-                return CryptoUtil.encrypt(JSON.toJSONString(ajaxResult));
-            } catch (Exception e) {
-                log.error("AjaxResult加密失败：" + body, e);
-                return ajaxResult;
-            }
-        } else if (body instanceof TableDataInfo) {
-            TableDataInfo tableDataInfo = (TableDataInfo) body;
-            try {
-                return CryptoUtil.encrypt(JSON.toJSONString(tableDataInfo));
-            } catch (Exception e) {
-                log.error("TableDataInfo加密失败：" + body, e);
-                return tableDataInfo;
-            }
-        }
+//        if (body instanceof AjaxResult) {
+//            AjaxResult ajaxResult = (AjaxResult) body;
+//            try {
+//                return CryptoUtil.encrypt(JSON.toJSONString(ajaxResult));
+//            } catch (Exception e) {
+//                log.error("AjaxResult加密失败：" + body, e);
+//                return ajaxResult;
+//            }
+//        } else if (body instanceof TableDataInfo) {
+//            TableDataInfo tableDataInfo = (TableDataInfo) body;
+//            try {
+//                return CryptoUtil.encrypt(JSON.toJSONString(tableDataInfo));
+//            } catch (Exception e) {
+//                log.error("TableDataInfo加密失败：" + body, e);
+//                return tableDataInfo;
+//            }
+//        }
         return body;
     }
 }

eitc-patient-base/src/main/java/com/eitc/patient/domain/MedicalRecord.java

@@ -66,6 +66,10 @@ public class MedicalRecord extends EitcBaseEntity {
     @ApiModelProperty(value = "检查内容", name = "inspectContent")
     private String inspectContent;
 
+    @TableField(value = "image_inspect_content")
+    @ApiModelProperty(value = "影像检查内容", name = "imageInspectContent")
+    private String imageInspectContent;
+
     @TableField(value = "treatment_planning_content")
     @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
     private String treatmentPlanningContent;

eitc-patient-base/src/main/java/com/eitc/patient/dto/DiagnosisTypeTemplateDto.java

@@ -62,9 +62,15 @@ public class DiagnosisTypeTemplateDto {
     @ApiModelProperty(value = "检查内容", name = "inspectContent")
     private String inspectContent;
 
+    @ApiModelProperty(value = "影像检查内容", name = "imageInspectContent")
+    private String imageInspectContent;
+
     @ApiModelProperty(value = "检查选项", name = "inspectOption")
     private JSONObject inspectOption;
 
+    @ApiModelProperty(value = "影像检查选项", name = "imageInspectOption")
+    private JSONObject imageInspectOption;
+
     @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
     private String treatmentPlanningContent;
 

eitc-patient-base/src/main/java/com/eitc/patient/param/MedicalRecordSaveParam.java

@@ -55,6 +55,9 @@ public class MedicalRecordSaveParam {
     @ApiModelProperty(value = "检查内容", name = "inspectContent")
     private String inspectContent;
 
+    @ApiModelProperty(value = "检查内容", name = "imageInspectContent")
+    private String imageInspectContent;
+
     @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
     private String treatmentPlanningContent;
 

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/MedicalRecordServiceImpl.java

@@ -125,6 +125,7 @@ public class MedicalRecordServiceImpl extends ServiceImpl<MedicalRecordMapper, M
         medicalRecord.setChiefComplaintContent(param.getChiefComplaintContent());
         medicalRecord.setPresentIllnessContent(param.getPresentIllnessContent());
         medicalRecord.setInspectContent(param.getInspectContent());
+        medicalRecord.setImageInspectContent(param.getImageInspectContent());
         medicalRecord.setTreatmentPlanningContent(param.getTreatmentPlanningContent());
         medicalRecord.setDisposeContent(param.getDisposeContent());
         medicalRecord.setNoteContent(param.getNoteContent());

eitc-patient-base/src/main/java/com/eitc/patient/vo/MedicalRecordToPdf.java

@@ -69,6 +69,9 @@ public class MedicalRecordToPdf {
     @ApiModelProperty(value = "检查内容", name = "inspectContent")
     private String inspectContent;
 
+    @ApiModelProperty(value = "影像检查内容", name = "imageInspectContent")
+    private String imageInspectContent;
+
     @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
     private String treatmentPlanningContent;
 

eitc-patient-base/src/main/resources/mapper/patient/MedicalRecordMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     emr.chief_complaint_content like concat('%', #{searchParam}, '%')
                     or emr.dispose_content like concat('%', #{searchParam}, '%')
                     or emr.inspect_content like concat('%', #{searchParam}, '%')
+                    or emr.image_inspect_content like concat('%', #{searchParam}, '%')
                     or emr.present_illness_content like concat('%', #{searchParam}, '%')
                     or emr.treatment_planning_content like concat('%', #{searchParam}, '%')
                     or emr.note_content like concat('%', #{searchParam}, '%')

eitc-patient-pc/src/main/java/com/eitc/patient/controller/MedicalRecordController.java

@@ -176,6 +176,7 @@ public class MedicalRecordController extends BaseController {
             mrt.setChiefComplaintContent(medicalRecord.getChiefComplaintContent());
             mrt.setPresentIllnessContent(medicalRecord.getPresentIllnessContent());
             mrt.setInspectContent(medicalRecord.getInspectContent());
+            mrt.setImageInspectContent(medicalRecord.getImageInspectContent());
             mrt.setTreatmentPlanningContent(medicalRecord.getTreatmentPlanningContent());
             mrt.setDisposeContent(medicalRecord.getDisposeContent());
             mrt.setDiagnosisContent(medicalRecord.getDiagnosisContent());
@@ -477,6 +478,7 @@ public class MedicalRecordController extends BaseController {
         dto.setChiefComplaintOption(JSONObject.parseObject(diagnosisTypeTemplate.getChiefComplaintOption()));
         dto.setPresentIllnessOption(JSONObject.parseObject(diagnosisTypeTemplate.getPresentIllnessOption()));
         dto.setInspectOption(JSONObject.parseObject(diagnosisTypeTemplate.getInspectOption()));
+        dto.setImageInspectOption(JSONObject.parseObject("{\"dic_data\":{},\"text\":\"\",\"str\":[{\"type\":\"string\",\"value\":\"\"}]}"));
         dto.setTreatmentPlanningOption(JSONObject.parseObject(diagnosisTypeTemplate.getTreatmentPlanningOption()));
         dto.setDisposeOption(JSONObject.parseObject(diagnosisTypeTemplate.getDisposeOption()));
         dto.setNoteOption(JSONObject.parseObject(diagnosisTypeTemplate.getNoteOption()));
@@ -484,6 +486,7 @@ public class MedicalRecordController extends BaseController {
         dto.setChiefComplaintContent(JSONObject.parseObject(diagnosisTypeTemplate.getChiefComplaintOption()).getString("text"));
         dto.setPresentIllnessContent(JSONObject.parseObject(diagnosisTypeTemplate.getPresentIllnessOption()).getString("text"));
         dto.setInspectContent(JSONObject.parseObject(diagnosisTypeTemplate.getInspectOption()).getString("text"));
+        dto.setImageInspectContent("");
         dto.setTreatmentPlanningContent(JSONObject.parseObject(diagnosisTypeTemplate.getTreatmentPlanningOption()).getString("text"));
         dto.setDisposeContent(JSONObject.parseObject(diagnosisTypeTemplate.getDisposeOption()).getString("text"));
         dto.setNoteContent(JSONObject.parseObject(diagnosisTypeTemplate.getNoteOption()).getString("text"));

sql/初始化脚本.sql

@@ -35302,6 +35302,7 @@ CREATE TABLE `erm_medical_record`  (
                                      `chief_complaint_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主诉内容',
                                      `present_illness_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '现病史内容',
                                      `inspect_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '检查内容',
+                                     `image_inspect_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '影像检查',
                                      `treatment_planning_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '治疗计划内容',
                                      `dispose_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '处置内容',
                                      `note_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '便签',