Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/zh/zh_his_api_controller.go

@@ -643,7 +643,7 @@ func (c *ZHHisApiController) GetSettleInfo() {
 
 	}
 
-	if record.InHospitalStatus == 1 && record.OutHospitalStatus == 1 {
+	if record.InHospitalStatus == 1 && record.OutHospitalStatus == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHospitalNoExistDataException)
 		return
 	}
@@ -852,10 +852,10 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		return
 	}
 
-	if record.InHospitalStatus == 1 && record.OutHospitalStatus == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHospitalNoExistDataException)
-		return
-	}
+	//if record.InHospitalStatus == 1 && record.OutHospitalStatus == 0 {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHospitalNoExistDataException)
+	//	return
+	//}
 
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)