tijiao

tcm/src/main/java/com/ccsens/tcm/service/PatientService.java

@@ -107,6 +107,9 @@ public class PatientService implements IPatientService {
 
     @Override
     public void saveCaseMes(PatientDto.saveCaseMes param, Long userId) {
+        if(param.getList().size()==0){
+            throw new BaseException(CodeEnum.QINGTIJIAOSHITI);
+        }
         //拿到这个患者的基本信息
         PatientInformation patientInformation = patientInformationMapper.selectByPrimaryKey(param.getPatientId());
         //处理过的答案信息集合

tcm/src/main/resources/mapper_dao/QuestionDao.xml

@@ -123,7 +123,8 @@
 
   <select id="getQuestionByCodeAndPatientId" resultMap="getQuestionByCodeAndPatientId">
       SELECT
-      *
+      *,
+      tpr.contents AS explains
       FROM
       (
     SELECT
@@ -146,7 +147,6 @@
     r.id as recordId,
     if(r.collect_time is null, 0,r.collect_time) as collect_time,
     r.contents as answer,
-    if(r.contents_type = 2,r.contents,null) as explains,
 
     if(r.contents_type = 1 and SUBSTRING_INDEX(r.contents,':',1) = o.submit_value,
     SUBSTRING(r.contents,char_length(o.submit_value)+2),null
@@ -163,8 +163,15 @@
     and q.rec_status = 0
     and q.`code` = #{code}
 
-      )a
+      ) qq,
-      ORDER BY a.qsort,a.osort,a.choose DESC,-a.otherInformation DESC
+      t_patient_record tpr
+      where
+          tpr.test_questions_id = qq.qid
+          AND tpr.contents_type = 2
+          AND tpr.patient_id = #{patientId}
+          AND tpr.collect_time = #{nums}
+          AND tpr.rec_status = 0
+      ORDER BY qq.qsort,qq.osort,qq.choose DESC,-qq.otherInformation DESC
   </select>
 
   <resultMap id="getQuestionByOptionId" type="com.ccsens.tcm.bean.vo.QuestionVo$PatientQuestion">

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -185,6 +185,7 @@ public enum CodeEnum {
     NOT_HOSPITAL(154,"未找到医院信息",true),
     ZHUYUANIDCHONGFU(155,"住院号重复",true),
     MEIYOUGAIYISHENG(156,"该医生信息查询不正确",true),
+    QINGTIJIAOSHITI(157,"请提交答案",true),
     ;