fixBug:修复初诊单，问诊单BUG

fs-service/src/main/java/com/fs/his/mapper/FsFirstDiagnosisMapper.java

@@ -82,18 +82,18 @@ public interface FsFirstDiagnosisMapper extends BaseMapper<FsFirstDiagnosis>{
     List<FsDiagnosisListDVO> selectFsDiagnosisListDVO(@Param("maps") FsDiagnosisListDParam param);
 
     @Select({"<script>" +
-            "SELECT fd.*,u.qw_user_name FROM fs_first_diagnosis fd" +
-            "LEFT JOIN qw_user u ON u.id = fd.qw_user_id" +
-            "WHERE 1=1" +
-            "<if test='param.doctorStatus != null'> AND fd.doctor_status = #{param.doctorStatus}</if>" +
-            "<if test='param.userId != null'> AND fd.user_id = #{param.userId}</if>" +
-            "ORDER BY fd.create_time des" +
+            "SELECT fd.*,u.qw_user_name FROM fs_first_diagnosis fd " +
+            "LEFT JOIN qw_user u ON u.id = fd.qw_user_id " +
+            "WHERE 1 = 1 " +
+            "<if test='param.doctorStatus != null'> AND fd.doctor_status = #{param.doctorStatus} </if>" +
+            "<if test='param.userId != null'> AND fd.user_id = #{param.userId} </if>" +
+            "ORDER BY fd.create_time desc " +
             "</script>"})
     List<FsFirstDiagnosisListUVO> selectFsFirstDiagnosisListUVO(@Param("param") FsFirstDiagnosisListUParam param);
 
     @Select({"<script>" +
-            "SELECT fd.*,u.qw_user_name FROM fs_first_diagnosis fd" +
-            "LEFT JOIN qw_user u ON u.id = fd.qw_user_id" +
+            "SELECT fd.*,u.qw_user_name FROM fs_first_diagnosis fd " +
+            "LEFT JOIN qw_user u ON u.id = fd.qw_user_id " +
             "WHERE fd.id = #{id}" +
             "</script>"})
     FsFirstDiagnosisListUVO getInfo(Long id);

fs-service/src/main/java/com/fs/his/mapper/FsInquiryPatientInfoMapper.java

@@ -20,20 +20,20 @@ public interface FsInquiryPatientInfoMapper {
     FsInquiryPatientVO selectUserAndCompanyUserByInquiryOrderId(Long inquiryOrderId);
 
     @Select({"<script>" +
-            "SELECT pi.*,p.patient_name,p.birthday,p.sex, u.nick_name companyUserName FROM fs_inquiry_patient_info pi" +
-            "LEFT JOIN fs_patient p ON p.patient_id  = pi.patient_id" +
-            "LEFT JOIN company_user u ON u.user_id = pi.company_user_id" +
-            "WHERE 1=1" +
-            "<if test='param.userId != null'> AND pi.user_id = #{param.userId}</if>" +
-            "ORDER BY pi.create_time des" +
+            "SELECT pi.*,p.patient_name,p.birthday,p.sex, u.nick_name companyUserName FROM fs_inquiry_patient_info pi " +
+            "LEFT JOIN fs_patient p ON p.patient_id  = pi.patient_id " +
+            "LEFT JOIN company_user u ON u.user_id = pi.company_user_id " +
+            "WHERE 1=1 " +
+            "<if test='param.userId != null'> AND pi.user_id = #{param.userId} </if> " +
+            "ORDER BY pi.create_time desc " +
             "</script>"})
     List<FsInquiryPatientInfoListUVO> selectFsInquiryPatientInfoListUVO(@Param("param") FsInquiryPatientInfoUParam param);
 
     @Select({"<script>" +
-            "SELECT pi.*,p.patient_name,p.birthday,p.sex, u.nick_name companyUserName FROM fs_inquiry_patient_info pi" +
-            "LEFT JOIN fs_patient p ON p.patient_id  = pi.patient_id" +
-            "LEFT JOIN company_user u ON u.user_id = pi.company_user_id" +
-            "WHERE pi.id = #{id}" +
+            "SELECT pi.*,p.patient_name,p.birthday,p.sex, u.nick_name companyUserName FROM fs_inquiry_patient_info pi " +
+            "LEFT JOIN fs_patient p ON p.patient_id  = pi.patient_id " +
+            "LEFT JOIN company_user u ON u.user_id = pi.company_user_id " +
+            "WHERE pi.id = #{id} " +
             "</script>"})
     FsInquiryPatientInfoListUVO getInfo(Long id);
 }

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryPatientInfoServiceImpl.java

@@ -60,6 +60,8 @@ public class FsInquiryPatientInfoServiceImpl implements IFsInquiryPatientInfoSer
         if (fsInquiryPatientInfo != null) {
             BeanCopyUtils.copy(fsInquiryPatientInfo, inquiryPatientVO);
             inquiryPatientVO.setDoctorAdviceJson(JSONUtil.toBean(fsInquiryPatientInfo.getDoctorAdviceJson(), DoctorAdviceVO.class));
+        } else {
+            inquiryPatientVO = new FsInquiryPatientVO();
         }
         return inquiryPatientVO;
     }