问诊以及顶部信息修改

icss-service/src/main/java/com/diagbot/dto/ReadInquiryDTO.java

@@ -25,6 +25,12 @@ public class ReadInquiryDTO{
 	@ApiModelProperty(value="内容JSON字符串")
 	private String dataJson;
 	
-	private List<InquiryDetail> details;
+    /**
+     * 类型：0：结构化 1：文本模式
+     */
+	@ApiModelProperty(value="类型：0：结构化 1：文本模式")
+    private Integer sign;
+	
+	private List<InquiryDetail> detailList;
 	
 }

icss-service/src/main/java/com/diagbot/entity/InquiryInfo.java

@@ -92,7 +92,7 @@ public class InquiryInfo implements Serializable {
     private String diagnose;
 
     /**
-     * 类型：1：结构化 2：文本模式
+     * 类型：0：结构化 1：文本模式
      */
     private Integer sign;
 

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -136,15 +136,16 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         if (inquiryInfo != null) {
             readInquiryDTO.setDataJson(inquiryInfo.getDataJson());
+            BeanUtil.copyProperties(inquiryInfo, readInquiryDTO);
             
             QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
             inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
-            readInquiryDTO.setDetails(inquiryDetailFacade.list(inquiryDetailQe));
+            readInquiryDTO.setDetailList(inquiryDetailFacade.list(inquiryDetailQe).stream().sorted((a,b)->a.getType()-b.getType()).collect(Collectors.toList()));
         }
 
         return readInquiryDTO;
     }
-    
+
     /**
      * 获取最近一次其他史信息
      *

icss-service/src/main/resources/mapper/PatientInfoMapper.xml

@@ -57,15 +57,13 @@
 		d.id_no as patientIdNo,
 		ROUND(DATEDIFF(CURDATE(), d.birthday)/365.2422) as patientAge
 		FROM tran_hospital_info a LEFT JOIN tran_hospital_dept b 
-		ON a.`code`=b.hospital_code
+		ON a.`code`=b.hospital_code and b.`status`=1 and b.is_deleted='N' and b.`code`=#{hospitalDeptCode} 	
 		LEFT JOIN tran_doctor_info c 
-		ON b.hospital_code=c.hospital_code and b.`code`=c.hospital_dept_code
+		ON b.hospital_code=c.hospital_code and b.`code`=c.hospital_dept_code and c.is_deleted='N' and c.`code`=#{doctorCode}
 		LEFT JOIN tran_patient_info d 
-		ON c.hospital_code=d.hospital_code
-		WHERE a.is_deleted='N' AND b.is_deleted='N'
-		AND c.is_deleted='N' AND d.is_deleted='N'
-		AND a.`status`=1 AND b.`status`=1	
-		AND a.`code`=#{hospitalCode} AND b.`code`=#{hospitalDeptCode} 
-		AND c.`code`=#{doctorCode} AND d.`code`=#{patientCode}
+		ON a.code=d.hospital_code and d.is_deleted='N' and d.`code`=#{patientCode}
+		WHERE a.is_deleted='N' 
+		AND a.`status`=1
+		AND a.`code`=#{hospitalCode} 
     </select>
 </mapper>