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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10028
+org_id =
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -2285,9 +2285,9 @@ func (c *HisApiController) GetUploadInfo() {
 
 		} else {
 			if miConfig.InsuplcAdmdvs == "440781" { //
-				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
+				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 			} else {
-				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
+				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 			}
 			saveLog(result, requestLog, "2203", "上传就诊信息")
 			var respJSON2 map[string]interface{}
@@ -2384,7 +2384,7 @@ func (c *HisApiController) GetUploadInfo() {
 			data["chrg_bchno"] = chrg_bchno
 			data["org_name"] = miConfig.OrgName
 			data["doctor"] = roles.UserName
-			data["doctor_id"] = strconv.FormatInt(roles.AdminUserId, 10)
+			data["doctor_id"] = roles.DoctorNumber
 			data["dept"] = strconv.FormatInt(patientPrescription.Departments, 10)
 			data["fixmedins_code"] = miConfig.Code
 			if (department.ID == 0 && adminUser.CurrentOrgId == 9919) || (department.ID == 0 && adminUser.CurrentOrgId == 10106) {
@@ -3683,9 +3683,9 @@ func (c *HisApiController) GetPreUploadInfo() {
 		var result string
 		var requestLog string
 		if miConfig.InsuplcAdmdvs == "440781" { //
-			result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
+			result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config)
 		} else {
-			result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+			result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
 			saveLog(result, requestLog, "2203", "上传就诊信息")
 			var respJSON2 map[string]interface{}
 			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {

service/gdyb_service.go

@@ -517,7 +517,7 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id int64, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) (string, string) {
+func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -626,7 +626,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 }
 
 // 门诊就诊信息上传
-func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id int64, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) (string, string) {
+func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -745,6 +745,8 @@ type Custom struct {
 	MedListCodg      string
 	LmtUsedFlag      int64
 	HospApprFlag     int64
+	DoctorNumber     string
+	DoctorName       string
 }
 
 type RequestResult struct {
@@ -807,11 +809,14 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	var customs []*Custom
 
 	for _, item := range hisPrescription {
+		role, _ := GetAdminUserInfoByID(item.UserOrgId, item.Creator)
+
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
 					//var randNum int
 					//randNum = rand.Intn(10000) + 1000
+					role, _ := GetAdminUserInfoByID(item.UserOrgId, item.Creator)
 					cus := &Custom{
 						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
 						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
@@ -819,6 +824,8 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						Price:            fmt.Sprintf("%.2f", subItem.Price),
 						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
 						HospApprFlag:     subItem.HospApprFlag,
+						DoctorNumber:     role.DoctorNumber,
+						DoctorName:       role.UserName,
 					}
 
 					customs = append(customs, cus)
@@ -839,6 +846,8 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							FeedetlSn:        subItem.FeedetlSn,
 							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 							MedListCodg:      subItem.HisProject.MedicalCode,
+							DoctorNumber:     role.DoctorNumber,
+							DoctorName:       role.UserName,
 							HospApprFlag:     -1,
 						}
 						customs = append(customs, cus)
@@ -853,6 +862,8 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
 							HospApprFlag:     -1,
+							DoctorNumber:     role.DoctorNumber,
+							DoctorName:       role.UserName,
 						}
 						customs = append(customs, cus)
 					}
@@ -871,6 +882,8 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 					MedListCodg:      subItem.XtHisAddtionConfig.Code,
 					HospApprFlag:     -1,
+					DoctorNumber:     role.DoctorNumber,
+					DoctorName:       role.UserName,
 				}
 				customs = append(customs, cus)
 			}
@@ -905,8 +918,8 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["medc_way_dscr"] = ""                          // 用药途径描述
 		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
-		feedetailInfo["bilg_dr_codg"] = doctor_id                    // 开单医生编码
-		feedetailInfo["bilg_dr_name"] = doctor                       // 开单医师姓名
+		feedetailInfo["bilg_dr_codg"] = item.DoctorNumber            // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = item.DoctorName              // 开单医师姓名
 		feedetailInfo["acord_dept_codg"] = ""                        // 受单科室编码
 		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
 		feedetailInfo["orders_dr_code"] = ""                         // 受单医生编码

service/his_service.go

@@ -1132,9 +1132,7 @@ func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.Hi
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
-		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ?", org_id)
-	}).
+		}).
 		Where("id in (?) AND user_org_id = ? AND status = 1", ids, org_id).
 		Find(&prescription).Error