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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true

controllers/sg/gdyb_controller.go

@@ -159,9 +159,7 @@ func (c *GdybController) PostFour() {
 	diag_code := c.GetString("diag_code")
 	sick_code := c.GetString("sick_code")
 	sick_name := c.GetString("sick_name")
-
-	fmt.Println(sick_code)
-	fmt.Println(sick_name)
+	dept := c.GetString("dept")
 
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
@@ -169,9 +167,9 @@ func (c *GdybController) PostFour() {
 
 	var result string
 	if insuplc_admdvs == "440781" { //
-		result = service.Gdyb2203A(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)
+		result = service.Gdyb2203A(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept)
 	} else {
-		result = service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)
+		result = service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept)
 	}
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/sg/his_api_controller.go

@@ -11,7 +11,6 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 	"io"
 	"io/ioutil"
@@ -1589,13 +1588,13 @@ func (c *HisApiController) GetRegisterInfo() {
 	certificates, _ := c.GetInt64("certificates")
 	medical_care, _ := c.GetInt64("medical_care")
 	birthday := c.GetString("birthday")
-	age, _ := c.GetInt64("age")
+	//age, _ := c.GetInt64("age")
 	id_card := c.GetString("id_card")
 	register_type, _ := c.GetInt64("register")
 	doctor, _ := c.GetInt64("doctor")
 	department, _ := c.GetInt64("department")
 	gender, _ := c.GetInt64("sex")
-	phone := c.GetString("phone")
+	//phone := c.GetString("phone")
 	registration_fee, _ := c.GetFloat("registration_fee")
 	medical_expenses, _ := c.GetFloat("medical_expenses")
 	social_type, _ := c.GetInt64("social_type")
@@ -1645,6 +1644,7 @@ 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)
@@ -1655,7 +1655,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	}
 
 	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)
+		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&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)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1779,6 +1779,8 @@ func (c *HisApiController) GetRegisterInfo() {
 				insutype = "310"
 			}
 
+			insutype = "390"
+
 			//if count == 1 {
 			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
 			//	return
@@ -1851,7 +1853,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
 					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
 					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName + "&dept=" + roles.UserName
 				resp2, requestErr2 := http.Get(api2)
 				if requestErr2 != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1937,45 +1939,6 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGdybOneException)
 		}
-	} else {
-		timeStr := time.Now().Format("2006-01-02")
-		timeArr := strings.Split(timeStr, "-")
-		var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(patient.ID, 10)
-
-		his, err := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
-		var hisPatient models.XtHisPatient
-		if err == gorm.ErrRecordNotFound || his.ID == 0 {
-			hisPatient = models.XtHisPatient{
-				Name:                   name,
-				Age:                    age,
-				Gender:                 gender,
-				Birthday:               birthUnix,
-				Phone:                  phone,
-				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,
-				AdminUserId:            admin_user_id,
-				UserOrgId:              adminInfo.CurrentOrgId,
-				Status:                 1,
-				RecordDate:             recordDateTime,
-				IsReturn:               1,
-				PatientId:              patient.ID,
-				Ctime:                  time.Now().Unix(),
-				Mtime:                  time.Now().Unix(),
-				Number:                 str,
-			}
-			service.CreateHisPatient(&hisPatient)
-
-		}
-		c.ServeSuccessJSON(map[string]interface{}{
-			"his_info": hisPatient,
-		})
 	}
 }
 
@@ -2298,6 +2261,7 @@ func (c *HisApiController) GetUploadInfo() {
 					insutype = "310"
 				}
 
+				insutype = "390"
 				if his.IdCardType == 1 {
 					cert_no = his.MedicalInsuranceNumber
 
@@ -2439,168 +2403,6 @@ func (c *HisApiController) GetUploadInfo() {
 			//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCalOrderException)
 			//return
 		}
-
-	} else {
-		var total float64
-		for _, item := range prescriptions {
-			if item.Type == 1 { //药品
-				for _, subItem := range item.HisDoctorAdviceInfo {
-					total = total + (subItem.Price * subItem.PrescribingNumber)
-				}
-			}
-			if item.Type == 2 { //项目
-				for _, subItem := range item.HisPrescriptionProject {
-					total = total + (subItem.Price * float64(subItem.Count))
-				}
-			}
-
-			for _, subItem := range item.HisAdditionalCharge {
-				total = total + (subItem.Price * float64(subItem.Count))
-			}
-		}
-
-		allTotal := fmt.Sprintf("%.2f", total)
-		totals, _ := strconv.ParseFloat(allTotal, 64)
-		order := &models.HisOrder{
-			UserOrgId:             adminUser.CurrentOrgId,
-			HisPatientId:          his.ID,
-			PatientId:             id,
-			SettleAccountsDate:    recordDateTime,
-			Ctime:                 time.Now().Unix(),
-			Mtime:                 time.Now().Unix(),
-			Status:                1,
-			OrderStatus:           2,
-			Number:                chrg_bchno,
-			MedfeeSumamt:          totals,
-			PayWay:                pay_way,
-			PayPrice:              pay_price,
-			PayCardNo:             pay_card_no,
-			DiscountPrice:         discount_price,
-			PreferentialPrice:     preferential_price,
-			RealityPrice:          reality_price,
-			FoundPrice:            found_price,
-			MedicalInsurancePrice: medical_insurance_price,
-			PrivatePrice:          private_price,
-		}
-		err = service.CreateOrder(order)
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePreOrderException)
-			return
-		}
-
-		var customs []*Custom
-		for _, item := range prescriptions {
-
-			if item.Type == 1 { //药品
-				for _, subItem := range item.HisDoctorAdviceInfo {
-					cus := &Custom{
-						AdviceId:         subItem.ID,
-						ProjectId:        0,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
-						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", subItem.Price),
-						MedListCodg:      subItem.MedListCodg,
-						Type:             1,
-					}
-					customs = append(customs, cus)
-				}
-			}
-
-			if item.Type == 2 { //项目
-				for _, subItem := range item.HisPrescriptionProject {
-
-					cus := &Custom{
-						AdviceId:         0,
-						ProjectId:        subItem.ID,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
-						MedListCodg:      subItem.MedListCodg,
-						Type:             2,
-					}
-
-					customs = append(customs, cus)
-				}
-			}
-
-			for _, item := range item.HisAdditionalCharge {
-				cus := &Custom{
-					ItemId:           item.ID,
-					AdviceId:         0,
-					ProjectId:        0,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
-					Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
-					FeedetlSn:        item.FeedetlSn,
-					Price:            fmt.Sprintf("%.2f", float64(item.Price)),
-					MedListCodg:      item.XtHisAddtionConfig.Code,
-					Type:             3,
-				}
-
-				customs = append(customs, cus)
-			}
-
-		}
-
-		for _, item := range customs {
-			var advice_id int64 = 0
-			var project_id int64 = 0
-			var item_id int64 = 0
-
-			var types int64 = 0
-
-			if item.Type == 1 {
-				advice_id = item.AdviceId
-				project_id = 0
-				item_id = 0
-			} else if item.Type == 2 {
-				advice_id = 0
-				item_id = 0
-
-				project_id = item.ProjectId
-			} else if item.Type == 3 {
-				advice_id = 0
-				item_id = item.ItemId
-				project_id = 0
-			}
-
-			detItemFeeSumamt, _ := strconv.ParseFloat(item.DetItemFeeSumamt, 32)
-			cut, _ := strconv.ParseFloat(item.Cut, 32)
-			pric, _ := strconv.ParseFloat(item.Price, 32)
-
-			info := &models.HisOrderInfo{
-				OrderNumber:      order.Number,
-				UploadDate:       time.Now().Unix(),
-				AdviceId:         advice_id,
-				DetItemFeeSumamt: detItemFeeSumamt,
-				Cnt:              cut,
-				Pric:             pric,
-				PatientId:        id,
-				Status:           1,
-				Mtime:            time.Now().Unix(),
-				Ctime:            time.Now().Unix(),
-				UserOrgId:        adminUser.CurrentOrgId,
-				HisPatientId:     his.ID,
-				OrderId:          order.ID,
-				ProjectId:        project_id,
-				Type:             types,
-				ItemId:           item_id,
-			}
-			service.CreateOrderInfo(info)
-		}
-		//err := service.UpDateAddtionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-		err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-		err = service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime)
-		err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
-		if err == nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "结算成功",
-			})
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
-			return
-		}
 	}
 }
 
@@ -3339,23 +3141,25 @@ func (c *HisApiController) GetPreUploadInfo() {
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-	record_time := c.GetString("record_time")
-	patient_id, _ := c.GetInt64("patient_id")
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
+	//record_time := c.GetString("record_time")
+	//patient_id, _ := c.GetInt64("patient_id")
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
 	adminUser := c.GetAdminUserInfo()
-	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	recordDateTime := theTime.Unix()
+	//theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	//if err != nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+	//recordDateTime := theTime.Unix()
 	//his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	var order models.HisOrder
 	order, _ = service.GetHisOrderByID(order_id)
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	if order.ID == 0 {
-		order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+		//order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
 	}
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
@@ -3417,16 +3221,6 @@ func (c *HisApiController) Refund() {
 				"msg":  res.ErrMsg,
 			})
 		}
-	} else {
-		err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId, "", "")
-		if err == nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "退费成功",
-			})
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
 	}
 }
 
@@ -3434,7 +3228,6 @@ func (c *HisApiController) RefundNumber() {
 	record_time := c.GetString("record_time")
 	//patient_id, _ := c.GetInt64("patient_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-
 	his_patient_id, _ := c.GetInt64("id")
 
 	timeLayout := "2006-01-02"
@@ -3449,7 +3242,7 @@ func (c *HisApiController) RefundNumber() {
 	recordDateTime := theTime.Unix()
 	//his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 
-	his, _ := service.GetNewHisPatientRecord(adminUser.CurrentOrgId, his_patient_id)
+	his, _ := service.GetHisPatientRecord(adminUser.CurrentOrgId, his_patient_id)
 	//patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	//order, _ := service.GetHisOrderByID(order_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
@@ -3491,11 +3284,7 @@ func (c *HisApiController) RefundNumber() {
 		}
 
 		if res2.Infcode == 0 {
-			//err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
 			service.UpdataRegStatusTwo(his_patient_id, recordDateTime, adminUser.CurrentOrgId)
-
-			//err := service.UpdataRegStatus2()
-
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "退号成功",

controllers/sz/sz_his_api_controller.go

@@ -1664,7 +1664,9 @@ func (c *SZHisApiController) GetRegisterInfo() {
 
 func (c *SZHisApiController) RefundNumber() {
 	record_time := c.GetString("record_time")
-	patient_id, _ := c.GetInt64("patient_id")
+	//patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -1678,7 +1680,7 @@ func (c *SZHisApiController) RefundNumber() {
 	recordDateTime := theTime.Unix()
 	fmt.Println(recordDateTime)
 
-	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, theTime.Unix())
+	his, _ := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, theTime.Unix())
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	//结算流程
@@ -1721,7 +1723,7 @@ func (c *SZHisApiController) RefundNumber() {
 			return
 		}
 		if res.Transreturncode == "00000000" {
-			service.UpdataHisStatusSZ(adminUser.CurrentOrgId, his.MzNumber, his.Number, result)
+			service.UpdataHisStatusSZ(adminUser.CurrentOrgId, his.MzNumber, his.Number, result, his_patient_id)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "退号成功",
 			})
@@ -3217,7 +3219,9 @@ func (c *SZHisApiController) GetSettleInfo() {
 func (c *SZHisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	record_time := c.GetString("record_time")
-	patient_id, _ := c.GetInt64("patient_id")
+	//patient_id, _ := c.GetInt64("patient_id")
+	//his_patient_id, _ := c.GetInt64("his_patient_id")
+
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -3236,7 +3240,7 @@ func (c *SZHisApiController) Refund() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
 		return
 	}
-	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, theTime.Unix())
+	//his, _ := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, theTime.Unix())
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	//结算流程
@@ -3297,7 +3301,7 @@ func (c *SZHisApiController) Refund() {
 		}
 		if res.Transreturncode == "00000000" {
 			service.UpdataOrderlog(order_id, adminUser.CurrentOrgId, result)
-			service.UpdataOrderStatusSZ(order_id, order.Number, adminUser.CurrentOrgId, his.MzNumber, his.Number)
+			service.UpdataOrderStatusSZ(order_id, order.Number, adminUser.CurrentOrgId)
 			service.UpdataOrderInfoStatus(order.ID, order.Number, adminUser.CurrentOrgId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "退费成功",

service/gdyb_service.go

@@ -238,7 +238,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2201"                // 交易编码
@@ -371,7 +371,7 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string) string {
+func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -380,7 +380,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
@@ -459,7 +459,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 }
 
 // 门诊就诊信息上传
-func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string) string {
+func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -468,7 +468,7 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, d
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)

service/his_service.go

@@ -726,6 +726,7 @@ func UpdataRegStatusTwo(his_patient_id int64, record_time int64, org_id int64) {
 	writeDb.Model(&models.HisPatient{}).Where("status = 1 AND record_date =? AND user_org_id = ? AND his_patient_id = ?", record_time, org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
 	writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND user_org_id = ? AND his_patient_id = ?", org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
 	writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1  AND user_org_id = ? AND his_patient_id = ?", org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
+
 }
 
 func UpdataRegStatus2(id int64) error {

service/sz_his_service.go

@@ -1417,7 +1417,7 @@ func GetDoseCode(dose_id int64, user_org_id int64) (error, string) {
 	return err, data.Code
 }
 
-func UpdataOrderStatusSZ(id int64, number string, user_org_id int64, his_mz_number string, his_number string) (err error) {
+func UpdataOrderStatusSZ(id int64, number string, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "status": 0}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
@@ -1426,9 +1426,10 @@ func UpdataOrderStatusSZ(id int64, number string, user_org_id int64, his_mz_numb
 
 }
 
-func UpdataHisStatusSZ(user_org_id int64, his_mz_number string, his_number string, result string) (err error) {
+func UpdataHisStatusSZ(user_org_id int64, his_mz_number string, his_number string, result string, his_patient_id int64) (err error) {
 	err = writeDb.Model(&models.HisPatient{}).Where("status = 1 AND user_org_id = ? AND mz_number = ? AND number = ?", user_org_id, his_mz_number, his_number).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix(), "refund_detail": result}).Error
-
+	writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND user_org_id = ? AND his_patient_id = ?", user_org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
+	writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1  AND user_org_id = ? AND his_patient_id = ?", user_org_id, his_patient_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
 	return
 }