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

controllers/hb/hbyb_controller.go

@@ -185,7 +185,6 @@ func (c *HBybController) PostFour() {
 	sick_code := respJSON["sick_code"].(string)
 	sick_name := respJSON["sick_name"].(string)
 	dept := respJSON["dept"].(string)
-
 	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	secret_key := respJSON["secret_key"].(string)

controllers/sg/his_api_controller.go

@@ -5474,7 +5474,7 @@ func (c *HisApiController) GetUploadInfo() {
 			client := &http.Client{}
 			data["psn_no"] = his.PsnNo
 			data["mdtrt_id"] = his.Number
-			data["opter"] = roles.UserName
+			data["doctor"] = roles.UserName
 			data["department"] = department.Name
 			data["org_name"] = miConfig.OrgName
 			data["med_type"] = strconv.FormatInt(reg_type, 10)
@@ -5746,9 +5746,8 @@ func (c *HisApiController) GetUploadInfo() {
 			data["mdtrt_id"] = his.Number
 			data["chrg_bchno"] = chrg_bchno
 			data["org_name"] = miConfig.OrgName
-			data["doctor"] = doctor_info.UserName
+			data["doctor"] = roles.UserName
 			data["doctor_id"] = doctor_info.DoctorNumber
-			data["opter"] = roles.UserName
 			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) {
@@ -7402,11 +7401,11 @@ func (c *HisApiController) GetPreUploadInfo() {
 		client := &http.Client{}
 		data["psn_no"] = his.PsnNo
 		data["mdtrt_id"] = his.Number
-		data["doctor"] = roles.UserName
 		data["department"] = department.Name
 		data["org_name"] = miConfig.OrgName
 		data["med_type"] = strconv.FormatInt(reg_type, 10)
-		data["doctor_id"] = strconv.FormatInt(doctor_info.AdminUserId, 10)
+		data["doctor_id"] = doctor_info.DoctorNumber
+		data["doctor_name"] = roles.UserName
 		data["fixmedins_code"] = miConfig.Code
 		data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
 		data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
@@ -7416,9 +7415,9 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["begin_time"] = begin_time
 		data["dept"] = strconv.FormatInt(department.ID, 10)
 		data["config"] = config
+		data["opter"] = roles.UserName
 
 		fmt.Println(data)
-
 		bytesData, _ := json.Marshal(data)
 		req, _ := http.NewRequest("POST", "http://192.168.124.4:9532/"+"hbyb/2203", bytes.NewReader(bytesData))
 		resp, _ := client.Do(req)

main.go

@@ -14,7 +14,6 @@ func init() {
 	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 	//CreateLog(miConfig)
 	//UploadLog(miConfig)
-
 	//UploadSettleList(org_id)
 }
 func main() {