Browse Source

添加影像检查

matianxiang 4 weeks ago
parent
commit
adf124170b

+ 4 - 0
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></
160
   <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>
160
   <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>
161
  </tr>
161
  </tr>
162
  <tr>
162
  <tr>
163
+  <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>
164
+  <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>
165
+ </tr>
166
+ <tr>
163
   <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>
167
   <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>
164
   <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>
168
   <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>
165
  </tr>
169
  </tr>

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

@@ -32,23 +32,23 @@ public class CustomResponseBodyAdviceAdapter implements ResponseBodyAdvice<Objec
32
     @Override
32
     @Override
33
     public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
33
     public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
34
                                   Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
34
                                   Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
35
-        if (body instanceof AjaxResult) {
36
-            AjaxResult ajaxResult = (AjaxResult) body;
37
-            try {
38
-                return CryptoUtil.encrypt(JSON.toJSONString(ajaxResult));
39
-            } catch (Exception e) {
40
-                log.error("AjaxResult加密失败:" + body, e);
41
-                return ajaxResult;
42
-            }
43
-        } else if (body instanceof TableDataInfo) {
44
-            TableDataInfo tableDataInfo = (TableDataInfo) body;
45
-            try {
46
-                return CryptoUtil.encrypt(JSON.toJSONString(tableDataInfo));
47
-            } catch (Exception e) {
48
-                log.error("TableDataInfo加密失败:" + body, e);
49
-                return tableDataInfo;
50
-            }
51
-        }
35
+//        if (body instanceof AjaxResult) {
36
+//            AjaxResult ajaxResult = (AjaxResult) body;
37
+//            try {
38
+//                return CryptoUtil.encrypt(JSON.toJSONString(ajaxResult));
39
+//            } catch (Exception e) {
40
+//                log.error("AjaxResult加密失败:" + body, e);
41
+//                return ajaxResult;
42
+//            }
43
+//        } else if (body instanceof TableDataInfo) {
44
+//            TableDataInfo tableDataInfo = (TableDataInfo) body;
45
+//            try {
46
+//                return CryptoUtil.encrypt(JSON.toJSONString(tableDataInfo));
47
+//            } catch (Exception e) {
48
+//                log.error("TableDataInfo加密失败:" + body, e);
49
+//                return tableDataInfo;
50
+//            }
51
+//        }
52
         return body;
52
         return body;
53
     }
53
     }
54
 }
54
 }

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

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

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

@@ -62,9 +62,15 @@ public class DiagnosisTypeTemplateDto {
62
     @ApiModelProperty(value = "检查内容", name = "inspectContent")
62
     @ApiModelProperty(value = "检查内容", name = "inspectContent")
63
     private String inspectContent;
63
     private String inspectContent;
64
 
64
 
65
+    @ApiModelProperty(value = "影像检查内容", name = "imageInspectContent")
66
+    private String imageInspectContent;
67
+
65
     @ApiModelProperty(value = "检查选项", name = "inspectOption")
68
     @ApiModelProperty(value = "检查选项", name = "inspectOption")
66
     private JSONObject inspectOption;
69
     private JSONObject inspectOption;
67
 
70
 
71
+    @ApiModelProperty(value = "影像检查选项", name = "imageInspectOption")
72
+    private JSONObject imageInspectOption;
73
+
68
     @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
74
     @ApiModelProperty(value = "治疗计划内容", name = "treatmentPlanningContent")
69
     private String treatmentPlanningContent;
75
     private String treatmentPlanningContent;
70
 
76
 

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

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

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

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

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

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

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

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

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

@@ -176,6 +176,7 @@ public class MedicalRecordController extends BaseController {
176
             mrt.setChiefComplaintContent(medicalRecord.getChiefComplaintContent());
176
             mrt.setChiefComplaintContent(medicalRecord.getChiefComplaintContent());
177
             mrt.setPresentIllnessContent(medicalRecord.getPresentIllnessContent());
177
             mrt.setPresentIllnessContent(medicalRecord.getPresentIllnessContent());
178
             mrt.setInspectContent(medicalRecord.getInspectContent());
178
             mrt.setInspectContent(medicalRecord.getInspectContent());
179
+            mrt.setImageInspectContent(medicalRecord.getImageInspectContent());
179
             mrt.setTreatmentPlanningContent(medicalRecord.getTreatmentPlanningContent());
180
             mrt.setTreatmentPlanningContent(medicalRecord.getTreatmentPlanningContent());
180
             mrt.setDisposeContent(medicalRecord.getDisposeContent());
181
             mrt.setDisposeContent(medicalRecord.getDisposeContent());
181
             mrt.setDiagnosisContent(medicalRecord.getDiagnosisContent());
182
             mrt.setDiagnosisContent(medicalRecord.getDiagnosisContent());
@@ -477,6 +478,7 @@ public class MedicalRecordController extends BaseController {
477
         dto.setChiefComplaintOption(JSONObject.parseObject(diagnosisTypeTemplate.getChiefComplaintOption()));
478
         dto.setChiefComplaintOption(JSONObject.parseObject(diagnosisTypeTemplate.getChiefComplaintOption()));
478
         dto.setPresentIllnessOption(JSONObject.parseObject(diagnosisTypeTemplate.getPresentIllnessOption()));
479
         dto.setPresentIllnessOption(JSONObject.parseObject(diagnosisTypeTemplate.getPresentIllnessOption()));
479
         dto.setInspectOption(JSONObject.parseObject(diagnosisTypeTemplate.getInspectOption()));
480
         dto.setInspectOption(JSONObject.parseObject(diagnosisTypeTemplate.getInspectOption()));
481
+        dto.setImageInspectOption(JSONObject.parseObject("{\"dic_data\":{},\"text\":\"\",\"str\":[{\"type\":\"string\",\"value\":\"\"}]}"));
480
         dto.setTreatmentPlanningOption(JSONObject.parseObject(diagnosisTypeTemplate.getTreatmentPlanningOption()));
482
         dto.setTreatmentPlanningOption(JSONObject.parseObject(diagnosisTypeTemplate.getTreatmentPlanningOption()));
481
         dto.setDisposeOption(JSONObject.parseObject(diagnosisTypeTemplate.getDisposeOption()));
483
         dto.setDisposeOption(JSONObject.parseObject(diagnosisTypeTemplate.getDisposeOption()));
482
         dto.setNoteOption(JSONObject.parseObject(diagnosisTypeTemplate.getNoteOption()));
484
         dto.setNoteOption(JSONObject.parseObject(diagnosisTypeTemplate.getNoteOption()));
@@ -484,6 +486,7 @@ public class MedicalRecordController extends BaseController {
484
         dto.setChiefComplaintContent(JSONObject.parseObject(diagnosisTypeTemplate.getChiefComplaintOption()).getString("text"));
486
         dto.setChiefComplaintContent(JSONObject.parseObject(diagnosisTypeTemplate.getChiefComplaintOption()).getString("text"));
485
         dto.setPresentIllnessContent(JSONObject.parseObject(diagnosisTypeTemplate.getPresentIllnessOption()).getString("text"));
487
         dto.setPresentIllnessContent(JSONObject.parseObject(diagnosisTypeTemplate.getPresentIllnessOption()).getString("text"));
486
         dto.setInspectContent(JSONObject.parseObject(diagnosisTypeTemplate.getInspectOption()).getString("text"));
488
         dto.setInspectContent(JSONObject.parseObject(diagnosisTypeTemplate.getInspectOption()).getString("text"));
489
+        dto.setImageInspectContent("");
487
         dto.setTreatmentPlanningContent(JSONObject.parseObject(diagnosisTypeTemplate.getTreatmentPlanningOption()).getString("text"));
490
         dto.setTreatmentPlanningContent(JSONObject.parseObject(diagnosisTypeTemplate.getTreatmentPlanningOption()).getString("text"));
488
         dto.setDisposeContent(JSONObject.parseObject(diagnosisTypeTemplate.getDisposeOption()).getString("text"));
491
         dto.setDisposeContent(JSONObject.parseObject(diagnosisTypeTemplate.getDisposeOption()).getString("text"));
489
         dto.setNoteContent(JSONObject.parseObject(diagnosisTypeTemplate.getNoteOption()).getString("text"));
492
         dto.setNoteContent(JSONObject.parseObject(diagnosisTypeTemplate.getNoteOption()).getString("text"));

+ 1 - 0
sql/初始化脚本.sql

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