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

controllers/sg/his_api_controller.go

@@ -1645,6 +1645,15 @@ func (c *HisApiController) GetRegisterInfo() {
 	config, _ := service.GetMedicalInsuranceConfig(adminInfo.CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
 
+	his, _ := service.GetHisPatientInfoTwo(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+	if len(his) >= 1 {
+		order, _ := service.GetNewHisOrderTwo(adminInfo.CurrentOrgId, his[len(his)-1].Number, his[len(his)-1].PatientId, recordDateTime)
+		if len(his) >= 1 && order.ID == 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisPatientParamWrong)
+			return
+		}
+	}
+
 	if config.IsOpen == 1 {
 		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&certificates=" + strconv.FormatInt(certificates, 10)
 		resp, requestErr := http.Get(api)

controllers/sz/sz_his_api_controller.go

@@ -862,7 +862,17 @@ func (c *SZHisApiController) GetRegisterInfo() {
 	//doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
 	doctorDepartment, _ := service.GetDepartMentDetail(department)
 	adminRole, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
-	his, _ := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient_id, theTime.Unix())
+	//his, _ := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient_id, theTime.Unix())
+
+	his, _ := service.GetHisPatientInfoTwo(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+	if len(his) >= 1 {
+		order, _ := service.GetNewHisOrderTwo(adminInfo.CurrentOrgId, his[len(his)-1].Number, his[len(his)-1].PatientId, theTime.Unix())
+		if len(his) >= 1 && order.ID == 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisPatientParamWrong)
+			return
+		}
+	}
+
 	var custom_code string
 	var custom_project_name string
 	var allPrice float64
@@ -897,351 +907,347 @@ func (c *SZHisApiController) GetRegisterInfo() {
 
 		break
 	}
-	if his.ID == 0 {
-		var opera_name string
-		var opera_code string
-		if adminRole.ID == 0 {
-			opera_name = "管理员"
-			opera_code = "01"
-		} else {
-			opera_name = adminRole.UserName
-			opera_code = strconv.FormatInt(admin_user_id, 10)
-		}
-		month := time.Unix(1557042972, 0).Format("1")
-		year := time.Now().Format("2006")
-		month = time.Now().Format("01")
-		day := time.Now().Format("02")
-		//流水号
-		number := miConfig.Code + year + month + day +
-			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
-		mz_number := miConfig.Code + year + month + day +
+	var opera_name string
+	var opera_code string
+	if adminRole.ID == 0 {
+		opera_name = "管理员"
+		opera_code = "01"
+	} else {
+		opera_name = adminRole.UserName
+		opera_code = strconv.FormatInt(admin_user_id, 10)
+	}
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+	//流水号
+	number := miConfig.Code + year + month + day +
+		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
+	mz_number := miConfig.Code + year + month + day +
+		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000))
+
+	//1.判断读卡类型
+	//2.读卡 获取交易验证码，医疗证号，发卡地区行政区划代码
+	yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
+	fmt.Println(yiliao_number)
+	fmt.Println(id_card_number)
+	fmt.Println(verifyCode)
+	fmt.Println(version_code)
+	fmt.Println(ret4)
+
+	dept_code := doctorDepartment.Number
+
+	is_yidi = 1
+	tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
+	//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
+	fmt.Println(tempPatient.ID)
+	fmt.Println(patient_id)
+
+	if tempPatient.ID == patient_id {
+		temp_mz_number := miConfig.Code + year + month + day +
 			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000))
-
-		//1.判断读卡类型
-		//2.读卡 获取交易验证码，医疗证号，发卡地区行政区划代码
-		yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
-		fmt.Println(yiliao_number)
-		fmt.Println(id_card_number)
-		fmt.Println(verifyCode)
-		fmt.Println(version_code)
-		fmt.Println(ret4)
-
-		dept_code := doctorDepartment.Number
-
-		is_yidi = 1
-		tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
-		//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
-		fmt.Println(tempPatient.ID)
-		fmt.Println(patient_id)
-
-		if tempPatient.ID == patient_id {
-			temp_mz_number := miConfig.Code + year + month + day +
-				fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000))
-			tempVerifyCode, tempVersionCode := ReadCardGetCode("XX001" + "|" + temp_mz_number + "|" + miConfig.Code)
-
-			yiliao_number = "%GALMAFXJGKUKZNKWAIUH?;07857319025346309758?"
-
-			result001 := service.SzybXX001(opera_name, opera_code, miConfig.Code, yiliao_number, tempVerifyCode, temp_mz_number, tempVersionCode)
-
-			if ret4 == 0 { //本地卡流程
-				if is_yidi == 1 {
-
-					//var dat2 map[string]interface{}
-					//if err := json.Unmarshal([]byte(result001), &dat2); err == nil {
-					//	fmt.Println(dat2)
-					//} else {
-					//	fmt.Println(err)
-					//}
-					//userJSONBytes2, _ := json.Marshal(dat2)
-					//var res2 ResultMZ001
-					//if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
-					//	utils.ErrorLog("解析失败：%v", err)
-					//}
-
-					//本地就医流程
-					//挂号
-					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, dept_code, yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
-					var dat map[string]interface{}
-					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
-						fmt.Println(dat)
-					} else {
-						fmt.Println(err)
-					}
-					userJSONBytes, _ := json.Marshal(dat)
-					var res ResultOne
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+		tempVerifyCode, tempVersionCode := ReadCardGetCode("XX001" + "|" + temp_mz_number + "|" + miConfig.Code)
+
+		yiliao_number = "%GALMAFXJGKUKZNKWAIUH?;07857319025346309758?"
+
+		result001 := service.SzybXX001(opera_name, opera_code, miConfig.Code, yiliao_number, tempVerifyCode, temp_mz_number, tempVersionCode)
+
+		if ret4 == 0 { //本地卡流程
+			if is_yidi == 1 {
+
+				//var dat2 map[string]interface{}
+				//if err := json.Unmarshal([]byte(result001), &dat2); err == nil {
+				//	fmt.Println(dat2)
+				//} else {
+				//	fmt.Println(err)
+				//}
+				//userJSONBytes2, _ := json.Marshal(dat2)
+				//var res2 ResultMZ001
+				//if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+				//	utils.ErrorLog("解析失败：%v", err)
+				//}
+
+				//本地就医流程
+				//挂号
+				resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, dept_code, yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
+				userJSONBytes, _ := json.Marshal(dat)
+				var res ResultOne
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				if res.Transreturncode == "00000000" {
+					his := models.VMHisPatient{
+						Name:                   name,
+						Gender:                 gender,
+						Birthday:               birthUnix,
+						MedicalTreatmentType:   medical_care,
+						IdType:                 certificates,
+						IdCardNo:               id_card,
+						BalanceAccountsType:    settlementValue,
+						SocialType:             social_type,
+						MedicalInsuranceNumber: medical_insurance_card,
+						RegisterType:           register_type,
+						RegisterCost:           registration_fee,
+						TreatmentCost:          medical_expenses,
+						Status:                 1,
+						Ctime:                  time.Now().Unix(),
+						Mtime:                  time.Now().Unix(),
+						Iinfo:                  resp_result,
+						PatientId:              patient.ID,
+						RecordDate:             theTime.Unix(),
+						UserOrgId:              adminInfo.CurrentOrgId,
+						AdminUserId:            admin_user_id,
+						IsReturn:               1,
+						IdCardType:             id_card_type,
+						Doctor:                 doctor,
+						Departments:            department,
+						YiliaoNumber:           yiliao_number,
+						MzNumber:               number,
+						Number:                 mz_number,
+						PsnNo:                  health_card_no,
+						PatientInfo:            result001,
 					}
-					if res.Transreturncode == "00000000" {
-						his := models.VMHisPatient{
-							Name:                   name,
-							Gender:                 gender,
-							Birthday:               birthUnix,
-							MedicalTreatmentType:   medical_care,
-							IdType:                 certificates,
-							IdCardNo:               id_card,
-							BalanceAccountsType:    settlementValue,
-							SocialType:             social_type,
-							MedicalInsuranceNumber: medical_insurance_card,
-							RegisterType:           register_type,
-							RegisterCost:           registration_fee,
-							TreatmentCost:          medical_expenses,
-							Status:                 1,
-							Ctime:                  time.Now().Unix(),
-							Mtime:                  time.Now().Unix(),
-							Iinfo:                  resp_result,
-							PatientId:              patient.ID,
-							RecordDate:             theTime.Unix(),
-							UserOrgId:              adminInfo.CurrentOrgId,
-							AdminUserId:            admin_user_id,
-							IsReturn:               1,
-							IdCardType:             id_card_type,
-							Doctor:                 doctor,
-							Departments:            department,
-							YiliaoNumber:           yiliao_number,
-							MzNumber:               number,
-							Number:                 mz_number,
-							PsnNo:                  health_card_no,
-							PatientInfo:            result001,
-						}
-						service.CreateHisPatientTwo(&his)
-						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
-						if len(lists) == 1 {
-							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
-						}
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "挂号成功",
-						})
-					} else {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res.Transreturnmessage,
-						})
-						return
+					service.CreateHisPatientTwo(&his)
+					lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+					if len(lists) == 1 {
+						service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
 					}
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "挂号成功",
+					})
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res.Transreturnmessage,
+					})
+					return
+				}
 
+			} else {
+				//异地就医流程
+				//异地走鉴权流程
+				//authResult := CardAuth(number)
+				//fmt.Println(authResult)
+
+				//tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
+				//if tempPatient.ID == patient_id {
+				resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
+					fmt.Println(dat)
 				} else {
-					//异地就医流程
-					//异地走鉴权流程
-					//authResult := CardAuth(number)
-					//fmt.Println(authResult)
-
-					//tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
-					//if tempPatient.ID == patient_id {
-					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
-					var dat map[string]interface{}
-					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
-						fmt.Println(dat)
-					} else {
-						fmt.Println(err)
-					}
+					fmt.Println(err)
+				}
 
-					userJSONBytes, _ := json.Marshal(dat)
+				userJSONBytes, _ := json.Marshal(dat)
 
-					var res ResultOne
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+				var res ResultOne
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				if res.Transreturncode == "00000000" {
+					his := models.VMHisPatient{
+						Name:                   name,
+						Gender:                 gender,
+						Birthday:               birthUnix,
+						MedicalTreatmentType:   medical_care,
+						IdType:                 certificates,
+						IdCardNo:               id_card,
+						BalanceAccountsType:    settlementValue,
+						SocialType:             social_type,
+						MedicalInsuranceNumber: medical_insurance_card,
+						RegisterType:           register_type,
+						RegisterCost:           registration_fee,
+						TreatmentCost:          medical_expenses,
+						Status:                 1,
+						Ctime:                  time.Now().Unix(),
+						Mtime:                  time.Now().Unix(),
+						Iinfo:                  resp_result,
+						PatientId:              patient.ID,
+						RecordDate:             theTime.Unix(),
+						UserOrgId:              adminInfo.CurrentOrgId,
+						AdminUserId:            admin_user_id,
+						IsReturn:               1,
+						IdCardType:             id_card_type,
+						Doctor:                 doctor,
+						Departments:            department,
+						YiliaoNumber:           yiliao_number,
+						MzNumber:               number,
+						Number:                 mz_number,
+						PsnNo:                  health_card_no,
+						PatientInfo:            result001,
 					}
-					if res.Transreturncode == "00000000" {
-						his := models.VMHisPatient{
-							Name:                   name,
-							Gender:                 gender,
-							Birthday:               birthUnix,
-							MedicalTreatmentType:   medical_care,
-							IdType:                 certificates,
-							IdCardNo:               id_card,
-							BalanceAccountsType:    settlementValue,
-							SocialType:             social_type,
-							MedicalInsuranceNumber: medical_insurance_card,
-							RegisterType:           register_type,
-							RegisterCost:           registration_fee,
-							TreatmentCost:          medical_expenses,
-							Status:                 1,
-							Ctime:                  time.Now().Unix(),
-							Mtime:                  time.Now().Unix(),
-							Iinfo:                  resp_result,
-							PatientId:              patient.ID,
-							RecordDate:             theTime.Unix(),
-							UserOrgId:              adminInfo.CurrentOrgId,
-							AdminUserId:            admin_user_id,
-							IsReturn:               1,
-							IdCardType:             id_card_type,
-							Doctor:                 doctor,
-							Departments:            department,
-							YiliaoNumber:           yiliao_number,
-							MzNumber:               number,
-							Number:                 mz_number,
-							PsnNo:                  health_card_no,
-							PatientInfo:            result001,
-						}
-						service.CreateHisPatientTwo(&his)
-						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
-						if len(lists) == 1 {
-							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
-						}
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "挂号成功",
-						})
-					} else {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res.Transreturnmessage,
-						})
-						return
+					service.CreateHisPatientTwo(&his)
+					lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+					if len(lists) == 1 {
+						service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
 					}
-
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "挂号成功",
+					})
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res.Transreturnmessage,
+					})
+					return
 				}
 
-			} else { //异地卡流程
-				//readCardBasResult := ReadCardBasHSM(number)
-				//fmt.Println(readCardBasResult)
-				//是否异地就医，是的话走鉴权流程，不是的话走门诊挂号
-				if is_yidi == 1 { //1本地就医
-					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
-					var dat map[string]interface{}
-					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
-						fmt.Println(dat)
-					} else {
-						fmt.Println(err)
-					}
+			}
 
-					userJSONBytes, _ := json.Marshal(dat)
+		} else { //异地卡流程
+			//readCardBasResult := ReadCardBasHSM(number)
+			//fmt.Println(readCardBasResult)
+			//是否异地就医，是的话走鉴权流程，不是的话走门诊挂号
+			if is_yidi == 1 { //1本地就医
+				resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
 
-					var res ResultOne
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+				userJSONBytes, _ := json.Marshal(dat)
+
+				var res ResultOne
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				if res.Transreturncode == "00000000" {
+					his := models.VMHisPatient{
+						Name:                   name,
+						Gender:                 gender,
+						Birthday:               birthUnix,
+						MedicalTreatmentType:   medical_care,
+						IdType:                 certificates,
+						IdCardNo:               id_card,
+						BalanceAccountsType:    settlementValue,
+						SocialType:             social_type,
+						MedicalInsuranceNumber: medical_insurance_card,
+						RegisterType:           register_type,
+						RegisterCost:           registration_fee,
+						TreatmentCost:          medical_expenses,
+						Status:                 1,
+						Ctime:                  time.Now().Unix(),
+						Mtime:                  time.Now().Unix(),
+						Iinfo:                  resp_result,
+						PatientId:              patient.ID,
+						RecordDate:             theTime.Unix(),
+						UserOrgId:              adminInfo.CurrentOrgId,
+						AdminUserId:            admin_user_id,
+						IsReturn:               1,
+						IdCardType:             id_card_type,
+						Doctor:                 doctor,
+						Departments:            department,
+						YiliaoNumber:           yiliao_number,
+						MzNumber:               number,
+						Number:                 mz_number,
+						PsnNo:                  health_card_no,
+						PatientInfo:            result001,
 					}
-					if res.Transreturncode == "00000000" {
-						his := models.VMHisPatient{
-							Name:                   name,
-							Gender:                 gender,
-							Birthday:               birthUnix,
-							MedicalTreatmentType:   medical_care,
-							IdType:                 certificates,
-							IdCardNo:               id_card,
-							BalanceAccountsType:    settlementValue,
-							SocialType:             social_type,
-							MedicalInsuranceNumber: medical_insurance_card,
-							RegisterType:           register_type,
-							RegisterCost:           registration_fee,
-							TreatmentCost:          medical_expenses,
-							Status:                 1,
-							Ctime:                  time.Now().Unix(),
-							Mtime:                  time.Now().Unix(),
-							Iinfo:                  resp_result,
-							PatientId:              patient.ID,
-							RecordDate:             theTime.Unix(),
-							UserOrgId:              adminInfo.CurrentOrgId,
-							AdminUserId:            admin_user_id,
-							IsReturn:               1,
-							IdCardType:             id_card_type,
-							Doctor:                 doctor,
-							Departments:            department,
-							YiliaoNumber:           yiliao_number,
-							MzNumber:               number,
-							Number:                 mz_number,
-							PsnNo:                  health_card_no,
-							PatientInfo:            result001,
-						}
-						service.CreateHisPatientTwo(&his)
-						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
-						if len(lists) == 1 {
-							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
-						}
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "挂号成功",
-						})
-					} else {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res.Transreturnmessage,
-						})
-						return
+					service.CreateHisPatientTwo(&his)
+					lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+					if len(lists) == 1 {
+						service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
 					}
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "挂号成功",
+					})
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res.Transreturnmessage,
+					})
+					return
+				}
 
-				} else { //异地就医需要走鉴权流程
-					//authResult := CardAuth(number)
-					//fmt.Println(authResult)
-					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
-					var dat map[string]interface{}
-					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
-						fmt.Println(dat)
-					} else {
-						fmt.Println(err)
-					}
+			} else { //异地就医需要走鉴权流程
+				//authResult := CardAuth(number)
+				//fmt.Println(authResult)
+				resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
+				var dat map[string]interface{}
+				if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
+					fmt.Println(dat)
+				} else {
+					fmt.Println(err)
+				}
 
-					userJSONBytes, _ := json.Marshal(dat)
+				userJSONBytes, _ := json.Marshal(dat)
 
-					var res ResultOne
-					if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-						utils.ErrorLog("解析失败：%v", err)
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-						return
+				var res ResultOne
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				if res.Transreturncode == "00000000" {
+					his := models.VMHisPatient{
+						Name:                   name,
+						Gender:                 gender,
+						Birthday:               birthUnix,
+						MedicalTreatmentType:   medical_care,
+						IdType:                 certificates,
+						IdCardNo:               id_card,
+						BalanceAccountsType:    settlementValue,
+						SocialType:             social_type,
+						MedicalInsuranceNumber: medical_insurance_card,
+						RegisterType:           register_type,
+						RegisterCost:           registration_fee,
+						TreatmentCost:          medical_expenses,
+						Status:                 1,
+						Ctime:                  time.Now().Unix(),
+						Mtime:                  time.Now().Unix(),
+						Iinfo:                  resp_result,
+						PatientId:              patient.ID,
+						RecordDate:             theTime.Unix(),
+						UserOrgId:              adminInfo.CurrentOrgId,
+						AdminUserId:            admin_user_id,
+						IsReturn:               1,
+						IdCardType:             id_card_type,
+						Doctor:                 doctor,
+						Departments:            department,
+						YiliaoNumber:           yiliao_number,
+						MzNumber:               number,
+						Number:                 mz_number,
+						PsnNo:                  health_card_no,
+						PatientInfo:            result001,
 					}
-					if res.Transreturncode == "00000000" {
-						his := models.VMHisPatient{
-							Name:                   name,
-							Gender:                 gender,
-							Birthday:               birthUnix,
-							MedicalTreatmentType:   medical_care,
-							IdType:                 certificates,
-							IdCardNo:               id_card,
-							BalanceAccountsType:    settlementValue,
-							SocialType:             social_type,
-							MedicalInsuranceNumber: medical_insurance_card,
-							RegisterType:           register_type,
-							RegisterCost:           registration_fee,
-							TreatmentCost:          medical_expenses,
-							Status:                 1,
-							Ctime:                  time.Now().Unix(),
-							Mtime:                  time.Now().Unix(),
-							Iinfo:                  resp_result,
-							PatientId:              patient.ID,
-							RecordDate:             theTime.Unix(),
-							UserOrgId:              adminInfo.CurrentOrgId,
-							AdminUserId:            admin_user_id,
-							IsReturn:               1,
-							IdCardType:             id_card_type,
-							Doctor:                 doctor,
-							Departments:            department,
-							YiliaoNumber:           yiliao_number,
-							MzNumber:               number,
-							Number:                 mz_number,
-							PsnNo:                  health_card_no,
-							PatientInfo:            result001,
-						}
-						service.CreateHisPatientTwo(&his)
-						lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
-						if len(lists) == 1 {
-							service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
-						}
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "挂号成功",
-						})
-					} else {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"failed_code": -10,
-							"msg":         res.Transreturnmessage,
-						})
-						return
+					service.CreateHisPatientTwo(&his)
+					lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, theTime.Unix())
+					if len(lists) == 1 {
+						service.UpdateHisPrescriptionHisID(his.ID, patient.ID, theTime.Unix(), adminInfo.CurrentOrgId)
 					}
-
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "挂号成功",
+					})
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"failed_code": -10,
+						"msg":         res.Transreturnmessage,
+					})
+					return
 				}
+
 			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-			return
 		}
 	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
 		return
 	}
+
 }
 
 //func (c *SZHisApiController) GetInfo() {
@@ -2172,7 +2178,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 	var end_time int64
 
 	if settle_accounts_type == 1 { //日结
-		prescriptions, _ = service.GetHisPrescription(adminUser.CurrentOrgId, patient_id, recordDateTime)
+		prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 
 	} else { //月结
 		start_time_str := c.GetString("start_time")
@@ -2215,7 +2221,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 	adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
 	adminRole, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	his, err := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+	his, err := service.GetHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	mz_number := his.Number
 	number := miConfig.Code + year + month + day +
 		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
@@ -2395,7 +2401,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 			SettleAccountsDate:  recordDateTime,
 			Ctime:               time.Now().Unix(),
 			Mtime:               time.Now().Unix(),
-			Status:              1,
+			Status:              0,
 			Number:              chrg_bchno,
 			Infcode:             0,
 			WarnMsg:             "",
@@ -2512,6 +2518,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 
 				if res.Transreturncode == "00000000" {
 					order.OrderStatus = 2
+					order.Status = 1
 					order.PayWay = pay_way
 					order.PayPrice = pay_price
 					order.PayCardNo = pay_card_no

enums/error_code.go

@@ -255,6 +255,8 @@ const ( // ErrorCode
 	ErrorCodeHospitalNoExistDataException = 30009
 
 	ErrorCodeHospitalExistDataException = 300010
+
+	ErrorCodeHisPatientParamWrong = 300004
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -492,6 +494,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeHospitalNoExistDataException: "请先办理出院才能进行结算",
 
 	ErrorCodeHospitalExistDataException: "该患者已经入院，请选办理出院结算后再进行办理入院操作",
+	ErrorCodeHisPatientParamWrong:       "订单正在结算、请先结算完成",
 }
 
 type SGJError struct {

routers/router.go

@@ -3,10 +3,7 @@ package routers
 import (
 	//"gdyb/controllers/sz"
 
-	"gdyb/controllers/sg"
 	"gdyb/controllers/sz"
-	"gdyb/controllers/zh"
-
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
 	//admin_api "XT_New/controllers/admin_api_controllers"
@@ -25,9 +22,9 @@ func init() {
 		AllowCredentials: true,
 	}))
 
-	sg.HisManagerApiRegistRouters()
-	sg.GdybRegistRouters()
+	//sg.HisManagerApiRegistRouters()
+	//sg.GdybRegistRouters()
 	sz.SZHisManagerApiRegistRouters()
-	zh.ZHHisManagerApiRegistRouters()
+	//zh.ZHHisManagerApiRegistRouters()
 
 }

service/gdyb_service.go

@@ -376,8 +376,8 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
-	tempTime := time.Unix(timestamp, 0)
-	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
@@ -385,27 +385,29 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
 
-	inputMessage["infno"] = "2203"        // 交易编码
-	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
-	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
-	inputData["begntime"] = timeFormatOne // 开始时间
-	inputData["main_cond_dscr"] = ""      // 主要病情描述
-	inputData["dise_codg"] = sick_code    // 病种编码
-	inputData["dise_name"] = sick_name    // 病种名称
-	inputData["birctrl_type"] = ""        // 计划生育手术类别
-	inputData["birctrl_matn_date"] = ""   // 计划生育手术或生育日期
+	inputMessage["infno"] = "2203"   // 交易编码
+	inputData["mdtrt_id"] = mdtrtId  // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo      // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type // 医疗类别 16门诊特殊病
+	//inputData["begntime"] = timeFormatOne // 开始时间
+	inputData["begntime"] = "2021-04-10 12:20:30" // 开始时间
+	inputData["main_cond_dscr"] = ""              // 主要病情描述
+	inputData["dise_codg"] = sick_code            // 病种编码
+	inputData["dise_name"] = sick_name            // 病种名称
+	inputData["birctrl_type"] = ""                // 计划生育手术类别
+	inputData["birctrl_matn_date"] = ""           // 计划生育手术或生育日期
 
 	diseinfo_sun := make(map[string]interface{})
-	diseinfo_sun["diag_type"] = "1"           // 诊断类别
-	diseinfo_sun["diag_srt_no"] = "1"         // 诊断排序号
-	diseinfo_sun["diag_code"] = diag_code     // 诊断代码
-	diseinfo_sun["diag_name"] = diag          // 诊断名称
-	diseinfo_sun["diag_dept"] = department    // 诊断科室
-	diseinfo_sun["dise_dor_no"] = doctor_id   // 诊断医生编码
-	diseinfo_sun["dise_dor_name"] = doctor    // 诊断医生姓名
-	diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
-	diseinfo_sun["vali_flag"] = "1"           // 有效标志
+	diseinfo_sun["diag_type"] = "1"         // 诊断类别
+	diseinfo_sun["diag_srt_no"] = "1"       // 诊断排序号
+	diseinfo_sun["diag_code"] = diag_code   // 诊断代码
+	diseinfo_sun["diag_name"] = diag        // 诊断名称
+	diseinfo_sun["diag_dept"] = department  // 诊断科室
+	diseinfo_sun["dise_dor_no"] = doctor_id // 诊断医生编码
+	diseinfo_sun["dise_dor_name"] = doctor  // 诊断医生姓名
+	//diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
+	diseinfo_sun["diag_time"] = "2021-04-10 12:20:30"
+	diseinfo_sun["vali_flag"] = "1" // 有效标志
 
 	diseinfo = append(diseinfo, diseinfo_sun)
 	input["diseinfo"] = diseinfo
@@ -476,11 +478,13 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, d
 	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
 	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
 	inputData["begntime"] = timeFormatOne // 开始时间
-	inputData["main_cond_dscr"] = ""      // 主要病情描述
-	inputData["dise_codg"] = sick_code    // 病种编码
-	inputData["dise_name"] = sick_name    // 病种名称
-	inputData["birctrl_type"] = ""        // 计划生育手术类别
-	inputData["birctrl_matn_date"] = ""   // 计划生育手术或生育日期
+	inputData["begntime"] = "2021-04-10 12:20:30"
+
+	inputData["main_cond_dscr"] = ""    // 主要病情描述
+	inputData["dise_codg"] = sick_code  // 病种编码
+	inputData["dise_name"] = sick_name  // 病种名称
+	inputData["birctrl_type"] = ""      // 计划生育手术类别
+	inputData["birctrl_matn_date"] = "" // 计划生育手术或生育日期
 
 	inputData["matn_type"] = "" // 生育类别
 	inputData["geso_val"] = ""  // 孕周数
@@ -494,7 +498,9 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, d
 	diseinfo_sun["dise_dor_no"] = doctor_id   // 诊断医生编码
 	diseinfo_sun["dise_dor_name"] = doctor    // 诊断医生姓名
 	diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
-	diseinfo_sun["vali_flag"] = "1"           // 有效标志
+	diseinfo_sun["diag_time"] = "2021-04-10 12:20:30"
+
+	diseinfo_sun["vali_flag"] = "1" // 有效标志
 
 	diseinfo = append(diseinfo, diseinfo_sun)
 	input["diseinfo"] = diseinfo
@@ -678,13 +684,15 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	for _, item := range customs {
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["feedetl_sn"] = item.FeedetlSn
-		feedetailInfo["mdtrt_id"] = mdtrtId                          // 就诊 ID（来自2201接口返回）
-		feedetailInfo["psn_no"] = psnNo                              // 人员编号 （来自1101接口返回）
-		feedetailInfo["chrg_bchno"] = chrg_bchno                     // 收费批次号
-		feedetailInfo["dise_codg"] = ""                              // 病种编码
-		feedetailInfo["rxno"] = ""                                   // 处方号
-		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
-		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
+		feedetailInfo["mdtrt_id"] = mdtrtId            // 就诊 ID（来自2201接口返回）
+		feedetailInfo["psn_no"] = psnNo                // 人员编号 （来自1101接口返回）
+		feedetailInfo["chrg_bchno"] = chrg_bchno       // 收费批次号
+		feedetailInfo["dise_codg"] = ""                // 病种编码
+		feedetailInfo["rxno"] = ""                     // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"            // 外购处方标志
+		feedetailInfo["fee_ocur_time"] = timeFormatOne // 费用发生时间
+		feedetailInfo["fee_ocur_time"] = "2021-04-10 12:20:30"
+
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额

service/his_service.go

@@ -296,6 +296,22 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 	return
 }
 
+func GetNewHisPrescription(org_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND his_patient_id = ? AND order_status <> 2 AND p_type <> 1", org_id, record_date, his_patient_id).
+		Find(&prescription).Error
+	return
+}
+
 type OtherDrugWarehouseInfo struct {
 	ID               int64 `gorm:"column:id" json:"id" form:"id"`
 	DrugId           int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
@@ -1167,6 +1183,7 @@ func GetAllPatient(org_id int64) (patients []*models.Patients, err error) {
 
 func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_time int64, org_id int64) {
 	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
 	return
 }
 
@@ -1198,3 +1215,15 @@ func GetLastHisOrder(org_id int64) (his models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2", org_id).Last(&his).Error
 	return
 }
+
+func GetHisPatientInfoTwo(org_id int64, patient_id int64, record_date int64) (info []*models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Find(&info).Error
+	return
+}
+
+func GetNewHisOrderTwo(user_org_id int64, mdtrt_id string, patient_id int64, record_time int64) (order HisOrder, err error) {
+	err = readDb.Model(&HisOrder{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND mdtrt_id=? AND settle_accounts_date = ? ", user_org_id, patient_id, mdtrt_id, record_time).
+		Order("ctime desc").
+		Find(&order).Error
+	return
+}