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

controllers/zh/zh_his_api_controller.go

@@ -1310,10 +1310,10 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		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
+	//}
 	if record.IdCardType == 1 {
 	} else {
 		cert_no = record.Certno