新增随访表单全量表单

health-admin/src/main/resources/templates/dtp/followUp/followUpEdit.html

@@ -46,18 +46,6 @@
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
     .select2-dropdown {
         z-index: 9999 !important;
     }
@@ -486,7 +474,7 @@
                                                 <form id="ClosePlanForm" class="form-horizontal" style="font-size: 15px;">
                                                     <div class="col-sm-12">
                                                         <div class="form-group">
-                                                            <div class="form-group">
+                                                            <div >
                                                                 <h2><code>关闭原因</code></h2>
                                                             </div>
                                                             <label class="is-required">原因</label>
@@ -494,32 +482,32 @@
                                                                 <input type="radio" name="reason" class="form-check-radio"  th:each="dict : ${type}"  id="reason" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}">
                                                             </div>
 
-                                                            <div class="input-groups hidden" id="drugsStatusDiv" th:with="type=${@dict.getType('sys_hzgl_sfrw_closeplan_drugsstatu')}" style="width: 900px;">
+                                                            <div class="form-group hidden" id="drugsStatusDiv" >
                                                                 <label class="is-required">用药状态调整为</label>
-                                                                <label>
+                                                                <div class="input-groups"  th:with="type=${@dict.getType('sys_hzgl_sfrw_closeplan_drugsstatu')}" style="width: 900px;">
                                                                     <input type="radio" name="drugsStatus" class="form-check-radio"  th:each="dict : ${type}"  id="drugsStatus" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}">
-                                                                </label>
+                                                                </div>
                                                             </div>
-                                                            <div class="input-groups hidden" id="drugsStopDiv" th:with="type=${@dict.getType('sys_hzgl_sfrw_closeplan_yjstop')}" style="width: 1200px;">
+                                                            <div class="form-group hidden" id="drugsStopDiv ">
                                                                 <label class="is-required">永久停药类型</label>
-                                                                <label>
+                                                                <div class="input-groups hidden"  th:with="type=${@dict.getType('sys_hzgl_sfrw_closeplan_yjstop')}" style="width: 1200px;">
                                                                     <input type="radio" name="drugsStop" class="form-check-radio"  th:each="dict : ${type}"  id="drugsStop" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}">
-                                                                </label>
+                                                                </div>
                                                             </div>
 
-                                                            <div class="input-groups hidden" id="flowNoDiv" th:with="type=${@dict.getType('sys_gxhpz_yanchi_gyhzyybgf')}" style="width: 900px;">
+                                                            <div class="form-group hidden" id="flowNoDiv">
                                                                 <label class="is-required">随访不配合原因</label>
-                                                                <label>
+                                                                <div class="input-groups"  th:with="type=${@dict.getType('sys_gxhpz_yanchi_gyhzyybgf')}" style="width: 900px;">
                                                                     <input type="radio" name="flowNo" class="form-check-radio"  th:each="dict : ${type}"  id="flowNo" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}">
-                                                                </label>
+                                                                </div>
                                                             </div>
                                                             <div class="form-group hidden" id="otherReasonDiv">
                                                                 <label class="is-required">其他原因请补充</label>
-                                                                <label>
+                                                                <div>
                                                                     <input id="otherReason" name="otherReason" placeholder="这里可以输入...其他原因请补充到这里"
                                                                            class="styled-input"
                                                                            style="width: 800px;height: 40px;">
-                                                                </label>
+                                                                </div>
                                                             </div>
 
                                                         </div>
@@ -562,18 +550,14 @@
                                                     </div>
                                                     <div class="col-sm-12" id="specifiedTypeDiv">
                                                         <div class="form-group">
+                                                            <label class="is-required">指定类型</label>
                                                             <div class="input-groups" th:with="type=${@dict.getType('sys_hzgl_sfrw_closepan_istype')}" style="width: 900px;">
-                                                                <label class="is-required">指定类型</label>
-                                                                <div th:each="dict, iterStat : ${type}">
-                                                                    <label>
-                                                                        <input type="checkbox"
-                                                                               name="specifiedType"
-                                                                               class="form-check-radio"
-                                                                               th:id="'specifiedType_' + ${iterStat.index}"
-                                                                               th:value="${dict.dictLabel}"
-                                                                               th:text="${dict.dictLabel}">
-                                                                    </label>
-                                                                </div>
+                                                                <input type="checkbox"  th:each="dict, iterStat : ${type}"
+                                                                       name="specifiedType"
+                                                                       class="form-check-radio"
+                                                                       th:id="'specifiedType_' + ${iterStat.index}"
+                                                                       th:value="${dict.dictLabel}"
+                                                                       th:text="${dict.dictLabel}">
                                                             </div>
                                                         </div>
                                                     </div>
@@ -818,6 +802,15 @@
                                         <span class="status"></span>
                                     </div>
                                     <div class="customize-form-group edit">
+                                        <label class="is-required">不良反应处理方式：</label>
+                                        <textarea id="tar" name="tar" class="styled-input edit_inputs textareas"
+                                                  style="width: auto;height: 140px ;border: 1px solid ;"
+                                                  th:text="${tar}" placeholder="请描述不良反应处理方式..." rows="1.9" cols="112" ></textarea>
+
+                                        <span class="status"></span>
+                                    </div>
+
+                                    <div class="customize-form-group edit">
                                         <span class="status"></span>
                                         <div  class="tab-pane fade in active">
                                             <div class="panel-body">
@@ -826,7 +819,7 @@
                                                         <div style="/*display: flex;*/">
                                                             <label style="width: auto;">不良反应症状:</label>
                                                             <button type="button" data-toggle="modal"  class="btn btn-ms btn-primary" data-target="#myModal5">新增</button>
-                                                            <table id="byfyTable" style="width: 340px;">
+                                                            <table id="byfyTable" style="width: 800px;">
                                                                 <thead>
                                                                 <tr>
                                                                     <th>序号</th>

health-system/src/main/resources/mapper/dtp/SGxhpzFollowUpRecordsMapper.xml

@@ -6,7 +6,7 @@
         UPDATE s_gxhpz_follow_up_records
         <set>
             <!-- 合并用药是否引起不良反应 -->
-            <if test="combinedMedicationAdverseReaction != null">
+            <if test="combinedMedicationAdverseReaction != null and combinedMedicationAdverseReaction != ''">
                 combined_medication_adverse_reaction = #{combinedMedicationAdverseReaction},
             </if>
             <!-- 合并用药其他不良反应 -->
@@ -26,11 +26,11 @@
                 is_review = #{isReview},
             </if>
             <!-- 影像学检查 医保类型 -->
-            <if test="imagingInsuranceType != null and imagingInsuranceType != ''">
-                imaging_insurance_type = #{imagingInsuranceType},
+            <if test="imagingInsuranceTypeList != null and imagingInsuranceTypeList != ''">
+                imaging_insurance_type = #{imagingInsuranceTypeList},
             </if>
             <!-- CT 单选 -->
-            <if test="ctCheck != null">
+            <if test="ctCheck != null and ctCheck != ''">
                 ct_check = #{ctCheck},
             </if>
             <!-- CT文本 -->
@@ -62,8 +62,8 @@
                 imaging_examinations_image = #{imagingExaminationsImage},
             </if>
             <!-- 肿瘤标记物检查 多选 -->
-            <if test="tumorMarkerCheck != null and tumorMarkerCheck != ''">
-                tumor_marker_check = #{tumorMarkerCheck},
+            <if test="tumorMarkerCheckList != null and tumorMarkerCheckList != ''">
+                tumor_marker_check = #{tumorMarkerCheckList},
             </if>
             <!-- CEA -->
             <if test="cea != null and cea != ''">
@@ -118,8 +118,8 @@
                 lab_test_indicators_image = #{labTestIndicatorsImage},
             </if>
             <!-- 治疗类型 -->
-            <if test="treatmentType != null and treatmentType != ''">
-                treatment_type = #{treatmentType},
+            <if test="treatmentTypeList != null and treatmentTypeList != ''">
+                treatment_type = #{treatmentTypeList},
             </if>
             <!-- 用药前治疗方案 -->
             <if test="pre_medication_plan != null and pre_medication_plan != ''">
@@ -146,11 +146,11 @@
                 clinical_interaction = #{clinicalInteraction},
             </if>
             <!-- 请描述临床相互作用 -->
-            <if test="clinicalInteractionDescription != null">
+            <if test="clinicalInteractionDescription != null and clinicalInteractionDescription != ''">
                 clinical_interaction_description = #{clinicalInteractionDescription},
             </if>
             <!-- 是否有不必要重复用药 -->
-            <if test="unnecessaryRepeatedMedication != null">
+            <if test="unnecessaryRepeatedMedication != null and unnecessaryRepeatedMedication != ''">
                 unnecessary_repeated_medication = #{unnecessaryRepeatedMedication},
             </if>
             <!-- 重复用药首次使用日期 -->
@@ -174,12 +174,12 @@
                 medication_error_description = #{medicationErrorDescription},
             </if>
             <!-- 用药记录 -->
-            <if test="medicationRecord != null">
-                medication_record = #{medicationRecord},
+            <if test="medication_record != null and medication_record != ''">
+                medication_record = #{medication_record},
             </if>
             <!-- 合并用药记录 -->
-            <if test="combinedMedicationRecord != null">
-                combined_medication_record = #{combinedMedicationRecord},
+            <if test="combined_medication_record != null and combined_medication_record != ''">
+                combined_medication_record = #{combined_medication_record},
             </if>
             <!-- 疼痛标准评分NRS -->
             <if test="painNrsScore != null">
@@ -202,7 +202,7 @@
                 specific_question = #{specificQuestion},
             </if>
             <!-- 药师解答 -->
-            <if test="pharmacistResponse != null">
+            <if test="pharmacistResponse != null and pharmacistResponse != ''">
                 pharmacist_response = #{pharmacistResponse},
             </if>
             <!-- 患者病情评估 -->
@@ -210,8 +210,8 @@
                 patient_condition_assessment = #{patientConditionAssessment},
             </if>
             <!-- 共建项目描述 -->
-            <if test="projectDescription != null">
-                project_description = #{projectDFescription},
+            <if test="projectDescription != null and projectDescription != ''">
+                project_description = #{projectDescription},
             </if>
             <!-- 更新时间 -->
             updatedTime = CURRENT_TIMESTAMP,
@@ -243,7 +243,7 @@
                 is_review,
             </if>
             <!-- 影像学检查 医保类型 -->
-            <if test="imagingInsuranceType != null and imagingInsuranceType != ''">
+            <if test="imagingInsuranceTypeList != null and imagingInsuranceTypeList != ''">
                 imaging_insurance_type,
             </if>
             <!-- CT 单选 -->
@@ -279,7 +279,7 @@
                 imaging_examinations_image,
             </if>
             <!-- 肿瘤标记物检查 多选 -->
-            <if test="tumorMarkerCheck != null and tumorMarkerCheck != ''">
+            <if test="tumorMarkerCheckList != null and tumorMarkerCheckList != ''">
                 tumor_marker_check,
             </if>
             <!-- CEA -->
@@ -335,7 +335,7 @@
                 lab_test_indicators_image,
             </if>
             <!-- 治疗类型 -->
-            <if test="treatmentType != null and treatmentType != ''">
+            <if test="treatmentTypeList != null and treatmentTypeList != ''">
                 treatment_type,
             </if>
             <!-- 用药前治疗方案 -->
@@ -391,11 +391,11 @@
                 medication_error_description,
             </if>
             <!-- 用药记录 -->
-            <if test="medicationRecord != null and medicationRecord != ''">
+            <if test="medication_record != null and medication_record != ''">
                 medication_record,
             </if>
             <!-- 合并用药记录 -->
-            <if test="combinedMedicationRecord != null and combinedMedicationRecord != ''">
+            <if test="combined_medication_record != null and combined_medication_record != ''">
                 combined_medication_record,
             </if>
             <!-- 疼痛标准评分NRS -->

health-system/src/main/resources/mapper/gxhpz/followTaskMapper.xml

@@ -145,7 +145,7 @@
             DATE_FORMAT(t.timeFirstDiagnosis, '%Y-%m-%d') AS timeFirstDiagnosis2,
         DATE_FORMAT(p.timeFirstDiagnosis, '%Y-%m-%d %H:%i:%s') AS FirstDiagnosis
         from s_gxhpz_follow_task t
-            left join s_gxhpz_follow_up_records mr on t.taskId = mr.taskId
+            left join s_gxhpz_follow_up_records mr on t.id = mr.taskId
             left join s_dtp_ysfw_archive_management p on t.patientId = p.id
             left join s_gxhpz_follow_task_node n on t.taskId = n.taskId
             where t.id = #{id}
@@ -308,6 +308,9 @@
             <if test="good_response_symptom_id != null and good_response_symptom_id != ''">
                 good_response_symptom_id,
             </if>
+            <if test="tar != null and tar != ''">
+                tar,
+            </if>
             <if test="nutrition_evaluation_id != null and nutrition_evaluation_id != ''">
                 nutrition_evaluation_id,
             </if>
@@ -405,6 +408,7 @@
             <if test="followUpSummaryid != null and followUpSummaryid != ''">
                 #{followUpSummaryid},
             </if>
+
             <if test="disease != null and disease != ''">
                 #{disease},
             </if>
@@ -484,6 +488,9 @@
             <if test="good_response_symptom_id != null and good_response_symptom_id != ''">
                 #{good_response_symptom_id},
             </if>
+            <if test="tar != null and tar != ''">
+                #{tar},
+            </if>
             <if test="nutrition_evaluation_id != null and nutrition_evaluation_id != ''">
                 #{nutrition_evaluation_id},
             </if>
@@ -588,6 +595,7 @@
             <if test="followUpSummaryid != null and followUpSummaryid != ''">
                 followUpSummaryid = #{followUpSummaryid},
             </if>
+
             <if test="disease != null and disease != ''">
                 disease = #{disease},
             </if>
@@ -663,6 +671,9 @@
             <if test="good_response_symptom_id != null and good_response_symptom_id != ''">
                 good_response_symptom_id = #{good_response_symptom_id},
             </if>
+            <if test="tar != null and tar != ''">
+                tar = #{tar},
+            </if>
             <if test="nutrition_evaluation_id != null and nutrition_evaluation_id != ''">
                 nutrition_evaluation_id = #{nutrition_evaluation_id},
             </if>