Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/base_api_controller.go

@@ -70,8 +70,8 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 558
-		userAdmin.Mobile = "13535547901"
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
 
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
@@ -92,7 +92,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 4
-		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.CurrentAppId = 8642
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -316,8 +316,9 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 558
-		userAdmin.Mobile = "13535547901"
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
 		userAdmin.IsSuperAdmin = false
@@ -333,16 +334,14 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibe.Status = 1
 		subscibe.CreatedTime = 1538035409
 		subscibe.UpdatedTime = 1538035409
-
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 4
-		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.CurrentAppId = 8642
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
-
 		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		//this.StopRun()
 	}

controllers/dialysis_record_api_controller.go

@@ -265,7 +265,12 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.CurrentOrgId)
 
-	his_advices, _ := service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
+	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.CurrentOrgId)
+
+	var his_advices []*models.HisDoctorAdviceInfo
+	if is_open_config.IsOpen == 1 {
+		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
+	}
 
 	returnData := map[string]interface{}{
 		"patient":                     patient,
@@ -292,6 +297,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		"headNurses":                  headNurses,
 		"system_prescribe":            systemDialysisPrescribe,
 		"his_advices":                 his_advices,
+		"is_open_config":              is_open_config,
 	}
 	this.ServeSuccessJSON(returnData)
 

controllers/gdyb_controller.go

@@ -226,9 +226,15 @@ func (c *GdybController) PostSix() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 
 	secret_key := c.GetString("secret_key")
+	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key)
-
+	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -291,8 +297,16 @@ func (c *GdybController) PostNine() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
 	secret_key := c.GetString("secret_key")
-
-	result := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key)
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	result := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})

controllers/his_api_controller.go

@@ -57,12 +57,9 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/doctor/list", &HisApiController{}, "get:GetAdminUsers")
 
-	//beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
+	beego.Router("/api/hisprescription/get", &DialysisApiController{}, "Get:GetLastOrNextHisPrescription")
 
-	//新增附加费用
-	//beego.Router("/api/his/additionalcharge", &HisApiController{}, "Post:AdditionalCharge")
-
-	//beego.Router("/api/additionalcharge/get", &HisApiController{}, "Get:GetAdditionalcharge")
+	beego.Router("/api/callhisprescription/get", &DialysisApiController{}, "Get:GetCallHisPrescription")
 
 }
 
@@ -357,7 +354,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							s.Status = 1
 							s.UserOrgId = adminInfo.CurrentOrgId
 							s.RecordDate = recordDateTime
-							s.StartTime = recordDateTime
+							s.StartTime = time.Now().Unix()
 							s.Groupno = groupNo
 							s.CreatedTime = ctime
 							s.UpdatedTime = mtime
@@ -1304,7 +1301,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 	if config.IsOpen == 1 {
 
-		api := "http://127.0.0.1:9531/" + "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
+		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
 		resp, requestErr := http.Get(api)
 
 		if requestErr != nil {
@@ -1387,7 +1384,7 @@ func (c *HisApiController) GetRegisterInfo() {
 		doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
 
 		if count <= 0 {
-			api := "http://127.0.0.1:9531/" + "gdyb/two?cert_no=" + patient.IdCardNo + "&insutype=" +
+			api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + patient.IdCardNo + "&insutype=" +
 				res.Output.Iinfo[0].Insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
 				"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
@@ -1442,7 +1439,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
 
 			if err == nil {
-				api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
+				api := "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=" + "11" + "&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
@@ -1602,7 +1599,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 		bytesData, _ := json.Marshal(data)
-		req, _ := http.NewRequest("POST", "http://127.0.0.1:9531/"+"gdyb/five", bytes.NewReader(bytesData))
+		req, _ := http.NewRequest("POST", "http://127.0.0.1:9532/"+"gdyb/five", bytes.NewReader(bytesData))
 		resp, _ := client.Do(req)
 		defer resp.Body.Close()
 		body, ioErr := ioutil.ReadAll(resp.Body)
@@ -2009,11 +2006,82 @@ func (c *HisApiController) GetUploadInfo() {
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	number := c.GetString("number")
+	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()
+
+	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	order, _ := service.GetHisOrderByID(order_id)
+
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
+		api := "http://127.0.0.1:9531/" + "gdyb/nine?psn_no=" + his.PsnNo +
+			"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&setl_id=" + order.SetlId + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+		resp, requestErr := http.Get(api)
+		if requestErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		userJSONBytes, _ := json.Marshal(respJSON)
+		fmt.Println(respJSON)
+		fmt.Println(userJSONBytes)
+
+		api2 := "http://127.0.0.1:9531/" + "gdyb/six?psn_no=" + his.PsnNo +
+			"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+		resp2, requestErr2 := http.Get(api2)
+		if requestErr2 != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 
+		body2, ioErr2 := ioutil.ReadAll(resp2.Body)
+		if ioErr2 != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON2 map[string]interface{}
+		if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "退费成功",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 	} else {
 		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
 		if err == nil {
@@ -2024,9 +2092,7 @@ func (c *HisApiController) Refund() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-
 	}
-
 }
 
 func (this *HisApiController) AdditionalCharge() {
@@ -2115,3 +2181,51 @@ func (this *HisApiController) GetAdminUsers() {
 		"doctors": doctors,
 	})
 }
+
+func (this *DialysisApiController) GetLastOrNextHisPrescription() {
+	change_type, _ := this.GetInt64("type", 0)
+	record_date := this.GetString("record_time")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theAdviceRecordTime, _ := time.ParseInLocation(timeLayout, record_date, loc)
+	record_time := theAdviceRecordTime.Unix()
+	adminUserInfo := this.GetAdminUserInfo()
+	prescriptions, err := service.GetHisPrescriptionByType(change_type, record_time, adminUserInfo.CurrentOrgId, patient_id)
+	if err == nil {
+		if len(prescriptions) == 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceEmpty)
+			return
+		} else {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"prescriptions": prescriptions,
+			})
+			return
+		}
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) GetCallHisPrescription() {
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	end_time := this.GetString("end_time")
+	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	adminUserInfo := this.GetAdminUserInfo()
+	prescriptions, err := service.GetCallHisPrescriptions(startime.Unix(), endtime.Unix(), adminUserInfo.CurrentOrgId, patient_id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"prescriptions": prescriptions,
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -562,17 +562,17 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 		}
 
-		// if dialysisPrescribe != nil {
-		// 	dialysisPrescribe.UpdatedTime = time.Now().Unix()
-		// 	dialysisPrescribe.RecordDate = theAssessmentDateTime
-		// 	dialysisPrescribe.DewaterAmount = dewater_amount
-		// 	dialysisPrescribe.TargetUltrafiltration = dewater_amount
-		// 	dialysisPrescribe.Status = 1
-		// 	updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
-		// 	if updateErr != nil {
-		// 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-		// 	}
-		// }
+		if dialysisPrescribe != nil && dialysisPrescribe.TargetUltrafiltration == 0 {
+			dialysisPrescribe.UpdatedTime = time.Now().Unix()
+			dialysisPrescribe.RecordDate = theAssessmentDateTime
+			dialysisPrescribe.DewaterAmount = dewater_amount
+			dialysisPrescribe.TargetUltrafiltration = dewater_amount
+			dialysisPrescribe.Status = 1
+			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+			if updateErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+			}
+		}
 
 		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getPEErr != nil {

controllers/new_mobile_api_controllers/good_types.json

@@ -12,7 +12,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 1
+      "number": 1,
+      "out_stock": 1
     },
     {
       "id": 10001,
@@ -26,7 +27,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 2
+      "number": 2,
+      "out_stock": 1
     },
     {
       "id": 10002,
@@ -40,8 +42,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 3
-
+      "number": 3,
+      "out_stock": 1
     },
     {
       "id": 10003,
@@ -55,7 +57,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 4
+      "number": 4,
+      "out_stock": 1
     },
     {
       "id": 10004,
@@ -69,8 +72,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 5
-
+      "number": 5,
+      "out_stock": 1
     },
     {
       "id": 10005,
@@ -84,8 +87,8 @@
       "org_id": 13,
       "status": 1,
       "type": 1,
-      "number": 6
-
+      "number": 6,
+      "out_stock": 1
     },
     {
       "id": 79,
@@ -99,7 +102,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 7
+      "number": 7,
+      "out_stock": 1
     },
     {
       "id": 80,
@@ -113,7 +117,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 8
+      "number": 8,
+      "out_stock": 1
     },
     {
       "id": 81,
@@ -127,7 +132,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 9
+      "number": 9,
+      "out_stock": 1
     }, {
       "id": 81,
       "type_code": "14000009",
@@ -140,7 +146,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 10
+      "number": 10,
+      "out_stock": 1
     },{
       "id": 81,
       "type_code": "14000010",
@@ -153,7 +160,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 11
+      "number": 11,
+      "out_stock": 1
     },{
       "id": 81,
       "type_code": "14000011",
@@ -166,7 +174,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 12
+      "number": 12,
+      "out_stock": 1
     },{
       "id": 81,
       "type_code": "14000012",
@@ -179,7 +188,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 13
+      "number": 13,
+      "out_stock": 1
     }
   ]
 }

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -241,7 +241,6 @@ func (this *MobileRegistController) CreateOrg() {
 		InitEquitMentInformation(org)
 		//初始化显示配置和打印模版
 		InitShowConfig(org)
-
 		//初始化商品类型
 		InitGoodTypesConfig(org)
 
@@ -1267,6 +1266,7 @@ func InitGoodTypesConfig(org *models.Org) {
 			OrgId:    org.Id,
 			Status:   1,
 			Type:     1,
+			OutStock: item.OutStock,
 		}
 		service.AddSigleGoodType(good_type)
 	}

controllers/verify_login_controller.go

@@ -252,13 +252,16 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 							if len(ids) == 0 {
 								ids = purview_ids
 							} else {
-								ids = ids + "," + purview_ids
+								if len(purview_ids) > 0 {
+									ids = ids + "," + purview_ids
+								}
 							}
 
 							if len(system_ids) > 0 {
 								ids = ids + "," + system_ids
 							}
 						}
+
 						if len(ids) != 0 {
 							pruviews, _ = service.GetPurviewById(CompressStr(ids))
 							for _, item := range pruviews {

main.go

@@ -12,10 +12,10 @@ func init() {
 }
 
 func main() {
-	service.BeginAutoCreateWeekSchedulesJob()
-	service.BeginAutoCreateWeekDisinfectionJob()
+	//service.BeginAutoCreateWeekSchedulesJob()
+	//service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()
-	service.BeginAutoCreateStaffScheduleJob()
+	//service.BeginAutoCreateStaffScheduleJob()
 	beego.Run()
 }

models/his_models.go

@@ -422,6 +422,21 @@ func (HisDoctorAdviceParentTemplate) TableName() string {
 	return "his_doctor_advice_parent_template"
 }
 
+type VMDrug struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number"`
+}
+
+func (VMDrug) TableName() string {
+	return "xt_base_drug"
+}
+
 type HisDoctorAdviceTemplate struct {
 	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
 	OrgId                 int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
@@ -448,6 +463,7 @@ type HisDoctorAdviceTemplate struct {
 	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Way                   int64   `gorm:"column:way" json:"way" form:"way"`
 	DrugNameId            int64   `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	VMDrug                VMDrug  `gorm:"ForeignKey:TemplateId;AssociationForeignKey:ID" json:"advices"`
 }
 
 func (HisDoctorAdviceTemplate) TableName() string {

models/vm_models.go

@@ -348,6 +348,7 @@ type VMGoodsType struct {
 	Status   int64  `gorm:"column:status" json:"status"`
 	Type     int64  `gorm:"column:type" json:"type"`
 	Number   int64  `gorm:"column:number" json:"number"`
+	OutStock int64  `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
 }
 
 func (VMGoodsType) TableName() string {

service/dialysis_service.go

@@ -320,11 +320,22 @@ func ExceDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) err
 	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	return err
 }
+
+func ExceHidDoctorAdviceById(m *models.HisDoctorAdviceInfo, id int64, patientId int64) error {
+	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+	return err
+}
+
 func CheckDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
 	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND (id = ? Or parent_id=?) AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
 	return err
 }
 
+func CheckHisDoctorAdviceById(m *models.HisDoctorAdviceInfo, id int64, patientId int64) error {
+	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?) AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
+	return err
+}
+
 func CreateMonitor(m *models.MonitoringRecord) (err error) {
 	return writeDb.Create(m).Error
 }
@@ -1122,6 +1133,12 @@ func GetExecutionDoctors(orgid int64, patientid int64, id int64) (doctorAdvice [
 	return doctorAdvice, err
 }
 
+func GetHisExecutionDoctors(orgid int64, patientid int64, id int64) (doctorAdvice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? and patient_id = ? AND (id = ? Or parent_id=?) and status = 1", orgid, patientid, id, id).Find(&doctorAdvice).Error
+	return doctorAdvice, err
+}
+
 func FindHisDoctorAdviceById(orgID int64, id int64) (advice models.HisDoctorAdviceInfo, err error) {
 	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
 	return

service/gdyb_service.go

@@ -32,11 +32,11 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101"      // 交易编码
 	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["mdtrt_cert_no"] = ""     // 就诊凭证编号
 	inputData["card_sn"] = ""           // 卡识别码
 	inputData["begntime"] = ""          // 开始时间
 	inputData["psn_cert_type"] = ""     // 人员证件类型
-	inputData["certno"] = ""            // 证件号码
+	inputData["certno"] = certNo        // 证件号码
 	inputData["psn_name"] = ""          // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -484,14 +484,14 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 }
 
 //  门诊费用明细信息撤销
-func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
+func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "", insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2205" // 交易编码
@@ -673,14 +673,71 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算撤销
-func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string) string {
+func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "", "", "")
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2208" // 交易编码
+
+	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
+	inputData["setl_id"] = setlId   // 结算 ID
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+
+	url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2208"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", "test_hosp")
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+
+//  门诊结算撤销
+func Gdyb3201(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2208" // 交易编码

service/his_service.go

@@ -720,3 +720,81 @@ func UpdateHisPatientIsReturn(patientid int64, recorddate int64, orgid int64) (m
 	err := XTWriteDB().Model(&patient).Where("patient_id = ? and record_date = ? and user_org_id = ? and status = 1", patientid, recorddate, orgid).Updates(map[string]interface{}{"is_return": 3}).Error
 	return patient, err
 }
+
+type VMOtherHisPrescriptionInfo struct {
+	ID                int64                `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId         int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate        int64                `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId         int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status            int64                `gorm:"column:status" json:"status" form:"status"`
+	CheckGroup        []int64              `gorm:"-" json:"check_group" form:"check_group"`
+	VMHisPrescription []*VMHisPrescription `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId" json:"prescriptions"`
+}
+
+func (VMOtherHisPrescriptionInfo) TableName() string {
+	return "his_prescription_info"
+}
+
+type VMHisPrescription struct {
+	ID                     int64                            `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate             int64                            `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status                 int64                            `gorm:"column:status" json:"status" form:"status"`
+	OrderStatus            int64                            `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	BatchNumber            string                           `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                           `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Type                   int64                            `gorm:"column:type" json:"type" form:"type"`
+	HisDoctorAdviceInfo    []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"doctor_advice"`
+	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+}
+
+func (VMHisPrescription) TableName() string {
+	return "his_prescription"
+}
+
+func GetHisPrescriptionByType(change_type int64, record_time int64, org_id int64, patient_id int64) (advice []*VMOtherHisPrescriptionInfo, err error) {
+	if change_type == 1 { //根据日期取出上一方数据
+		var Id AdviceDate
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date < ?", patient_id, org_id, record_time).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
+			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", org_id).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+					})
+			}).Find(&advice).Error
+
+	} else if change_type == 2 {
+		var Id AdviceDate
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date > ?", patient_id, org_id, record_time).Select("record_date").Group("record_date").Order("record_date desc").Scan(&Id).Error
+		err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date  = ?", patient_id, org_id, Id.RecordDate).
+			Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", org_id).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+					})
+			}).Find(&advice).Error
+	}
+	return
+}
+
+func GetCallHisPrescriptions(start_time int64, end_time int64, org_id int64, patient_id int64) (advice []*VMOtherHisPrescriptionInfo, err error) {
+	err = readDb.Model(&VMOtherHisPrescriptionInfo{}).Where("patient_id = ? AND user_org_id = ? AND  status=1 AND record_date >= ? AND record_date <= ?", patient_id, org_id, start_time, end_time).
+		Preload("VMHisPrescription", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+				})
+		}).Find(&advice).Error
+
+	return
+}
+
+func GetHisOrderByID(order_id int64) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id = ?", order_id).First(&order).Error
+	return
+}

service/patient_service.go

@@ -710,6 +710,12 @@ func FindDoctorAdvice(orgID, id int64) (advice models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("id = ? and user_org_id=? and status = 1", id, orgID).First(&advice).Error
 	return
 }
+
+func FindHisDoctorAdvice(orgID, id int64) (advice models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ? and user_org_id=? and status = 1", id, orgID).First(&advice).Error
+	return
+}
+
 func FindDoctorAdviceByGroupNo(orgID, groupNo int64) (advice models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("groupno = ? and user_org_id=? and status = 1", groupNo, orgID).First(&advice).Error
 	return