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

controllers/sz/sz_his_api_controller.go

@@ -1691,6 +1691,13 @@ func (c *SZHisApiController) GetSettleInfo() {
 
 	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 
+	sick, _ := service.FindSickById(patientPrescription.SickType)
+
+	if sick.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamSickTypeWrong)
+		return
+	}
+
 	adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
 	adminRole, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
@@ -1968,7 +1975,6 @@ func (c *SZHisApiController) GetSettleInfo() {
 			//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 			tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 			if tempPatient.ID == patient_id {
-				sick, _ := service.FindSickById(patientPrescription.SickType)
 				result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, his.MedicalTreatmentType, sick.CountryCode)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result_three), &dat); err == nil {

enums/error_code.go

@@ -245,6 +245,8 @@ const ( // ErrorCode
 	ErrorDoctorLoginFaildParamWrong   = 30004
 
 	ErrorNoReadCardException = 30005
+
+	ErrorCodeParamSickTypeWrong = 30006
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -472,6 +474,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorDoctorLoginFaildParamWrong:    "登记失败",
 
 	ErrorNoReadCardException: "无法读取除社保卡以外的卡",
+
+	ErrorCodeParamSickTypeWrong: "医生所开处方的疾病类型不能为空",
 }
 
 type SGJError struct {