医保对接

controllers/coordinate_controller.go

@@ -68,6 +68,36 @@ type RefundDetail struct {
 	Code string `json:"code"`
 }
 
+type ResultQuery struct {
+	Msg    string `json:"msg"`
+	Result []struct {
+		Type      string `json:"type"`
+		Name      string `json:"name"`
+		Vaa01     int    `json:"vaa01"`
+		Vaa07     int    `json:"vaa07"`
+		Visittime string `json:"visittime"`
+	} `json:"result"`
+	Code string `json:"code"`
+}
+
+type ResultUpload struct {
+	Code   string `json:"code"`
+	Msg    string `json:"msg"`
+	Result []struct {
+		List            []interface{} `json:"list"`
+		Page            int64         `json:"page"`
+		Pagenumber      int64         `json:"pagenumber"`
+		Records         int64         `json:"records"`
+		RecordsFiltered int64         `json:"recordsFiltered"`
+		RecordsTotal    int64         `json:"recordsTotal"`
+		Result          string        `json:"result"`
+		ResultMsg       string        `json:"resultMsg"`
+		Total           int64         `json:"total"`
+		TotalPage       int64         `json:"totalPage"`
+		Userdata        string        `json:"userdata"`
+	} `json:"result"`
+}
+
 func CoordinateRcegistRouters() {
 	beego.Router("/coordinate/check", &CoordinateController{}, "get:SavePatientMessageInfo")
 	//坐标挂号
@@ -80,6 +110,439 @@ func CoordinateRcegistRouters() {
 	beego.Router("/coordinate/settle", &CoordinateController{}, "post:Settle")
 	//坐标退费回调
 	beego.Router("/coordinate/refund", &CoordinateController{}, "post:Refund")
+	//坐标患者查询～上传医嘱～结算功能
+	beego.Router("/coordinate/settleAccount", &CoordinateController{}, "get:SettleAccount")
+
+}
+
+func (c *CoordinateController) SettleAccount() {
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date := c.GetString("record_date")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	diagnosis_id := c.GetString("diagnosis")
+	sick_type, _ := c.GetInt64("sick_type")
+	reg_type, _ := c.GetInt64("p_type")
+	org_id, _ := c.GetInt64("org_id")
+	org_id = 3877
+	org, _ := service.GetOrgById(org_id)
+	patient, _ := service.GetPatientByID(org.Id, patient_id)
+	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
+
+	result, request := service.GetHisPatientForCoordinate(patient.IdCardNo)
+	saveLog(result, request, "查询", "查询", org.OrgName)
+	var res ResultQuery
+	if err := json.Unmarshal([]byte(result), &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if res.Code == "10000" {
+		if len(res.Result) == 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisPatientNoRegException)
+			return
+		}
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		org_id := org.Id
+		recordDateTime := theTime.Unix()
+		patientPrescription, _ := service.FindPatientPrescriptionInfoTwo(org_id, patient.ID, recordDateTime, 2)
+		if patientPrescription.ID == 0 {
+			patientPrescription, _ = service.FindLastPatientPrescriptionInfo(org_id, patient.ID, recordDateTime)
+		}
+		departmwnt, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+		doctor_info, _ := service.GetAdminUserInfoByID(org_id, patientPrescription.DoctorId)
+		//admin_user_info, _ := service.GetAdminUserInfoByID(org_id, admin_user_id)
+
+		var prescriptions []*models.HisPrescription
+
+		if settle_accounts_type == 1 { //日结
+			prescriptions, _ = service.GetUnSettleHisPrescriptionFive(org_id, patient_id, recordDateTime, 2)
+		} else { //月结
+
+			start_time_str := c.GetString("start_time")
+			end_time_str := c.GetString("end_time")
+			timeLayout := "2006-01-02"
+			loc, _ := time.LoadLocation("Local")
+			theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			recordStartTime := theStartTime.Unix()
+			theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			recordEndTime := theEndTime.Unix()
+			prescriptions, _ = service.GetUnSettleMonthHisPrescription(org_id, patient_id, recordStartTime, recordEndTime)
+		}
+		var total float64
+
+		for _, item := range prescriptions {
+			fmt.Println(item)
+			if item.Type == 1 { //药品
+				for _, subItem := range item.HisDoctorAdviceInfo {
+					total = total + (subItem.Price * subItem.PrescribingNumber)
+				}
+			}
+			if item.Type == 2 { //项目
+				for _, subItem := range item.HisPrescriptionProject {
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+					total = total + (subItem.Price * cnt)
+				}
+			}
+
+		}
+
+		var ids []int64
+
+		for _, item := range prescriptions {
+			ids = append(ids, item.ID)
+		}
+
+		var customs []*models.NewCustomTwo
+		for _, item := range prescriptions {
+			if item.Type == 1 { //药品
+				for _, subItem := range item.HisDoctorAdviceInfo {
+					cus := &models.NewCustomTwo{
+						AdviceId:         subItem.ID,
+						ProjectId:        0,
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            fmt.Sprintf("%.2f", subItem.Price),
+						MedListCodg:      subItem.Drug.MedicalInsuranceNumber,
+						Type:             1,
+					}
+					customs = append(customs, cus)
+				}
+			}
+			if item.Type == 2 { //项目
+				for _, subItem := range item.HisPrescriptionProject {
+					if subItem.Type == 2 {
+						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+						cus := &models.NewCustomTwo{
+							AdviceId:         0,
+							ProjectId:        subItem.ID,
+							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+							Cut:              fmt.Sprintf("%.4f", cnt),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+							MedListCodg:      subItem.HisProject.MedicalCode,
+							Type:             2,
+						}
+						customs = append(customs, cus)
+
+					} else {
+						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+						cus := &models.NewCustomTwo{
+							AdviceId:         0,
+							ProjectId:        subItem.ID,
+							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+							Cut:              fmt.Sprintf("%.4f", cnt),
+							FeedetlSn:        subItem.FeedetlSn,
+							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
+							Type:             3,
+						}
+						customs = append(customs, cus)
+					}
+
+				}
+			}
+		}
+
+		var info models.UploadInfo
+		info.Vaa01 = res.Result[0].Vaa01
+		info.Fasong = "1"
+		info.Vaa07 = res.Result[0].Vaa07
+		info.Bck01c = departmwnt.Number
+		info.Bce02a = doctor_info.DoctorNumber
+
+		diagnosis_ids := strings.Split(patientPrescription.Diagnosis, ",")
+		var config []*models.HisXtDiagnoseConfig
+		for _, item := range diagnosis_ids {
+			id, _ := strconv.ParseInt(item, 10, 64)
+			diagnosisConfig, _ := service.FindDiagnoseById(id)
+			config = append(config, diagnosisConfig)
+		}
+		for index, item := range config {
+			var diag models.Diag
+			diag.Vao06 = strconv.FormatInt(int64(index+1), 10)
+			diag.Bak02 = item.CountryCode
+			info.Diag = append(info.Diag, &diag)
+		}
+		var presInfos []*models.PresInfo
+		var presDetails []*models.PresDetail
+		for index, item := range prescriptions {
+			var presDetail models.PresDetail
+			var presInfo models.PresInfo
+			presInfo.Cbmid = strconv.FormatInt(item.ID, 10)
+			if item.Type == 1 {
+				presInfo.Cbm06 = "0"
+			} else {
+				presInfo.Cbm06 = "5"
+			}
+
+			if item.Type == 1 {
+				presInfo.Cbm07 = item.MedType
+			} else {
+				presInfo.Cbm07 = item.MedType
+			}
+
+			presDetail.Vaf59 = strconv.FormatInt(int64(index+1), 10)
+			var infoItems []*models.Item
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
+
+				var infoItem models.Item
+				infoItem.Rownr = "0"
+				infoItem.Vaf11 = "1"
+				infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+				infoItem.Bbx01 = subItem.Drug.MedicalInsuranceNumber
+				infoItem.Bda01 = "1"
+				infoItem.Bby01 = ""
+				if subItem.Drug.MinUnit != subItem.Drug.DoseUnit {
+					infoItem.Vaf22 = subItem.Drug.DrugName + " " + subItem.Drug.Dose + subItem.Drug.DoseUnit + "*" + strconv.FormatInt(subItem.Drug.MinNumber, 10) + subItem.Drug.MinUnit + "/" + subItem.Drug.MaxUnit
+				}
+				infoItem.Vaf14 = subItem.Drug.DrugName
+				infoItem.Bdi01 = ef.Code
+				infoItem.Vaf17 = strconv.FormatInt(subItem.Day, 10)
+				infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
+				infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
+				infoItem.Vaf35 = "0"
+				infoItem.Vaf32 = "0"
+				infoItem.Bck01b = departmwnt.Number
+				infoItem.Bck01d = departmwnt.Number
+				infoItem.Vaf58 = "0"
+				infoItem.Vaf61 = "1"
+				infoItems = append(infoItems, &infoItem)
+			}
+			for _, subItem := range item.HisPrescriptionProject {
+				ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
+
+				if subItem.Type == 2 {
+					var infoItem models.Item
+					infoItem.Rownr = "0"
+					infoItem.Vaf11 = "1"
+					infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+					infoItem.Bbx01 = subItem.HisProject.MedicalCode
+
+					if subItem.HisProject.CostClassify == 2 {
+						infoItem.Bda01 = "T"
+					} else if subItem.HisProject.CostClassify == 3 {
+						infoItem.Bda01 = "L"
+					} else {
+						infoItem.Bda01 = "T"
+					}
+					infoItem.Bby01 = ""
+					infoItem.Vaf22 = subItem.HisProject.ProjectName
+					infoItem.Bdi01 = ef.Code
+					infoItem.Vaf17 = subItem.Day
+					infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
+					infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.Count)
+					infoItem.Vaf35 = "0"
+					infoItem.Vaf18 = 0
+					infoItem.Vaf32 = "0"
+					infoItem.Bck01b = departmwnt.Number
+					infoItem.Bck01d = departmwnt.Number
+					infoItem.Vaf58 = "0"
+					infoItem.Vaf61 = "1"
+					infoItems = append(infoItems, &infoItem)
+
+				} else {
+					var infoItem models.Item
+					infoItem.Rownr = "0"
+					infoItem.Vaf11 = "1"
+					infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+					infoItem.Bbx01 = subItem.GoodInfo.MedicalInsuranceNumber
+					infoItem.Bda01 = "M"
+					infoItem.Bby01 = ""
+					infoItem.Vaf22 = subItem.GoodInfo.GoodName + " " + subItem.GoodInfo.SpecificationName
+					infoItem.Bdi01 = ef.Code
+					infoItem.Vaf17 = subItem.Day
+					infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
+					infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.Count)
+					infoItem.Vaf35 = "0"
+					infoItem.Vaf32 = "0"
+					infoItem.Bck01b = departmwnt.Number
+					infoItem.Bck01d = departmwnt.Number
+					infoItem.Vaf58 = "0"
+					infoItem.Vaf61 = "1"
+					infoItems = append(infoItems, &infoItem)
+
+				}
+
+			}
+			presDetail.Item = infoItems
+			presDetails = append(presDetails, &presDetail)
+			presInfo.PresDetail = presDetails
+			presInfos = append(presInfos, &presInfo)
+		}
+		info.PresInfo = presInfos
+
+		result2, request2 := service.UploadPrescriptionForCoordinate(info)
+		saveLog(result2, request2, "上传明细", "上传明细", org.OrgName)
+
+		var res2 ResultUpload
+		if err := json.Unmarshal([]byte(result2), &res2); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res2.Code == "10000" {
+
+			timestamp := time.Now().Unix()
+			tempTime := time.Unix(timestamp, 0)
+			timeFormat := tempTime.Format("20060102150405")
+			chrgBchno := rand.Intn(100000) + 10000
+			ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(patient.ID, 10)
+			his := models.VMHisPatient{
+				Name:                   patient.Name,
+				Gender:                 patient.Gender,
+				Birthday:               patient.Birthday,
+				MedicalTreatmentType:   0,
+				IdType:                 1,
+				IdCardNo:               patient.IdCardNo,
+				BalanceAccountsType:    1,
+				MedicalInsuranceNumber: "",
+				RegisterType:           0,
+				RegisterCost:           0,
+				TreatmentCost:          0,
+				Status:                 1,
+				Ctime:                  time.Now().Unix(),
+				Mtime:                  time.Now().Unix(),
+				PsnNo:                  strconv.FormatInt(int64(res.Result[0].Vaa01), 10),
+				PsnCertType:            "",
+				Certno:                 patient.IdCardNo,
+				PsnName:                patient.Name,
+				Gend:                   "",
+				Naty:                   "",
+				Brdy:                   "",
+				Age:                    0,
+				Iinfo:                  "",
+				Idetinfo:               "",
+				PatientId:              patient.ID,
+				RecordDate:             theTime.Unix(),
+				UserOrgId:              org_id,
+				AdminUserId:            admin_user_id,
+				IsReturn:               1,
+				Doctor:                 patientPrescription.DoctorId,
+				Departments:            patientPrescription.Departments,
+				IptOtpNo:               ipt_otp_no,
+				Number:                 strconv.FormatInt(int64(res.Result[0].Vaa07), 10),
+				PhoneNumber:            patient.Phone,
+			}
+			service.UpdateHisPatientStatus(&his)
+			service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, org_id)
+			tm := time.Unix(time.Now().Unix(), 0)
+
+			order := &models.HisOrder{
+				PsnNo:              his.PsnNo,
+				UserOrgId:          org_id,
+				HisPatientId:       his.ID,
+				PatientId:          patient_id,
+				SettleAccountsDate: recordDateTime,
+				Ctime:              time.Now().Unix(),
+				Mtime:              time.Now().Unix(),
+				Status:             1,
+				OrderStatus:        1,
+				MdtrtId:            his.Number,
+				Number:             ipt_otp_no,
+				SetlId:             "",
+				MedfeeSumamt:       total,
+				MedType:            strconv.Itoa(int(reg_type)),
+				SettleEndTime:      0,
+				SettleStartTime:    0,
+				SettleType:         settle_accounts_type,
+				Diagnosis:          diagnosis_id,
+				PType:              2,
+				SetlTime:           tm.Format("2006-01-02 15:04:05"),
+			}
+			err = service.CreateOrder(order)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+				return
+			}
+
+			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:        patient_id,
+					Status:           1,
+					Mtime:            time.Now().Unix(),
+					Ctime:            time.Now().Unix(),
+					UserOrgId:        org_id,
+					HisPatientId:     his.ID,
+					OrderId:          order.ID,
+					ProjectId:        project_id,
+					Type:             types,
+					ItemId:           item_id,
+				}
+				service.CreateOrderInfo(info)
+			}
+			his.Diagnosis = diagnosis_id
+			his.SickType = sick_type
+			his.RegisterType = reg_type
+			his.MedicalTreatmentType = reg_type
+			service.UpdataHisPateintTwo(&his)
+			err = service.UpDatePrescriptionNumber(org_id, ids, strconv.FormatInt(int64(chrgBchno), 10))
+			err = service.UpDateHisPrescriptionInfoNumber(org_id, patient_id, strconv.FormatInt(int64(chrgBchno), 10), recordDateTime, his.ID)
+			err = service.UpdataOrderStatusThree(strconv.FormatInt(int64(chrgBchno), 10), org_id)
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "医嘱保存成功",
+			})
+
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res.Msg,
+			})
+
+		}
+
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.Msg,
+		})
+
+	}
 
 }
 
@@ -97,15 +560,17 @@ func (c *CoordinateController) Settle() {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
-	patien_id := respJSON["patientid"].(string)
-	infoSeq := respJSON["infoseq"].(string)
-	docId := respJSON["docid"].(string)
-	fmt.Println(patien_id)
-	fmt.Println(infoSeq)
-	fmt.Println(docId)
-
-	order, _ := service.GetHisOrderFour(patien_id, infoSeq, "")
-	order.SetlId = docId
+	patien_id := respJSON["vaa01"].(float64)
+	infoSeq := respJSON["vaa07"].(float64)
+
+	//strconv.For(patien_id, 10)
+
+	vaa001 := fmt.Sprintf("%f", patien_id)
+	vaa007 := fmt.Sprintf("%f", infoSeq)
+
+	setl_id := respJSON["setl_id"].(string)
+	order, _ := service.GetHisOrderFour(vaa001, vaa007, "")
+	order.SetlId = setl_id
 	if order.ID == 0 {
 		json := make(map[string]interface{})
 		json["msg"] = "结算记录不存在，请检查参数是否正确"
@@ -134,10 +599,16 @@ func (c *CoordinateController) Refund() {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
-	patien_id := respJSON["patientid"].(string)
-	infoSeq := respJSON["infoseq"].(string)
-	docId := respJSON["docid"].(string)
-	order, _ := service.GetHisOrderFour(patien_id, infoSeq, docId)
+	patien_id := respJSON["vaa01"].(float64)
+	infoSeq := respJSON["vaa07"].(float64)
+
+	//strconv.For(patien_id, 10)
+
+	vaa001 := fmt.Sprintf("%f", patien_id)
+	vaa007 := fmt.Sprintf("%f", infoSeq)
+
+	docId := respJSON["setl_id"].(string)
+	order, _ := service.GetHisOrderFour(vaa001, vaa007, docId)
 	if order.ID == 0 {
 		json := make(map[string]interface{})
 		json["msg"] = "结算记录不存在，请检查参数是否正确"

controllers/data_api_controller.go

@@ -825,7 +825,6 @@ func (c *DataApiController) CreateExecutionFrequency() {
 		return
 	}
 	timeNow := time.Now().Unix()
-	ef.Code = ""
 	ef.Status = 1
 	ef.CreatedTime = timeNow
 	ef.UpdatedTime = timeNow
@@ -881,6 +880,7 @@ func (c *DataApiController) UpdateExecutionFrequency() {
 	timeNow := time.Now().Unix()
 	ef.UpdatedTime = timeNow
 	ef.Name = efdata.Name
+	ef.Code = efdata.Code
 
 	err = service.UpdateExecutionFrequency(ef)
 	if err != nil {

enums/error_code.go

@@ -260,6 +260,8 @@ const ( // ErrorCode
 
 	ErrorCodeDeleteMedicineWrong   = 3900003
 	ErrorCodeDeletePChargeWrongTwo = 3900004
+
+	ErrorCodeHisPatientNoRegException = 4000000
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -508,6 +510,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeDeletePChargeWrong:    "处方中包含收费处方或已经上传的处方,无法删除",
 	ErrorCodeDeleteMedicineWrong:   "该药品已经发药,无法删除",
 	ErrorCodeDeletePChargeWrongTwo: "该医嘱所属处方已经收费或已经上传的处方,无法删除",
+
+	ErrorCodeHisPatientNoRegException: "该患者尚未挂号，请先挂号",
 }
 
 type SGJError struct {

models/dialysis.go

@@ -1179,6 +1179,7 @@ type HisDoctorAdvice struct {
 	Way                   int64              `gorm:"column:way" json:"way" form:"way"`
 	DrugId                int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	DrugNameId            int64              `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	ExecutionFrequencyId  int64              `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisDoctorAdvice) TableName() string {

models/drug_pharmacy_management_models.go

@@ -195,6 +195,7 @@ type PharmacyHisDoctorAdviceInfo struct {
 	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	AdviceId              int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	ExecutionFrequencyId  int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (PharmacyHisDoctorAdviceInfo) TableName() string {

models/his_charge_models.go

@@ -1,18 +1,19 @@
 package models
 
 type HisChargePrescriptionProject struct {
-	ID                int64             `gorm:"column:id" json:"id" form:"id"`
-	ProjectId         int64             `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	UserOrgId         int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status            int64             `gorm:"column:status" json:"status" form:"status"`
-	PatientId         int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate        int64             `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count             string            `gorm:"column:count" json:"count" form:"count"`
-	Type              int64             `gorm:"column:type" json:"type" form:"type"`
-	Unit              string            `gorm:"column:unit" json:"unit" form:"unit"`
-	Remark            string            `gorm:"column:remark" json:"remark" form:"remark"`
-	HisChargeProject  HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
-	HisChargeGoodInfo HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	ID                   int64             `gorm:"column:id" json:"id" form:"id"`
+	ProjectId            int64             `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	UserOrgId            int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64             `gorm:"column:status" json:"status" form:"status"`
+	PatientId            int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate           int64             `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count                string            `gorm:"column:count" json:"count" form:"count"`
+	Type                 int64             `gorm:"column:type" json:"type" form:"type"`
+	Unit                 string            `gorm:"column:unit" json:"unit" form:"unit"`
+	Remark               string            `gorm:"column:remark" json:"remark" form:"remark"`
+	HisChargeProject     HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	HisChargeGoodInfo    HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	ExecutionFrequencyId int64             `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisChargePrescriptionProject) TableName() string {
@@ -31,6 +32,7 @@ type HisChargeDoctorAdviceInfo struct {
 	AdviceDate            int64  `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
 	Drug                  Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	IsMedicine            int64  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisChargeDoctorAdviceInfo) TableName() string {

models/his_models.go

@@ -256,6 +256,7 @@ type HisDoctorAdviceInfo struct {
 	LmtUsedFlag           int64                  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	HisOrderInfo          HisOrderInfo           `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"order_info"`
 	IsMedicine            int64                  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64                  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -803,10 +804,11 @@ type HisPrintPrescriptionProject struct {
 
 	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
 
-	FrequencyType int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount      int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay       string `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	IsCheckTeam   int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam          int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	ExecutionFrequencyId int64  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisPrintPrescriptionProject) TableName() string {
@@ -851,11 +853,12 @@ type HisPrescriptionProject struct {
 
 	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
 
-	FrequencyType int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount      int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay       string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	IsCheckTeam   int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
-	HisOrderInfo  HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+	FrequencyType        int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam          int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	HisOrderInfo         HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+	ExecutionFrequencyId int64        `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -1932,11 +1935,12 @@ type NewCustomHisPrescriptionProject struct {
 
 	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
 
-	FrequencyType int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount      int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay       string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	IsCheckTeam   int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
-	HisOrderInfo  HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+	FrequencyType        int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam          int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	HisOrderInfo         HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+	ExecutionFrequencyId int64        `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (NewCustomHisPrescriptionProject) TableName() string {
@@ -1964,24 +1968,25 @@ func (HisYidiClearRecord) TableName() string {
 }
 
 type HisPrescriptionProjectTwo struct {
-	ID             int64   `gorm:"column:id" json:"id" form:"id"`
-	ProjectId      int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price          float64 `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status         int64   `gorm:"column:status" json:"status" form:"status"`
-	PatientId      int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate     int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count          string  `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn      string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	Type           int64   `gorm:"column:type" json:"type" form:"type"`
-	Doctor         int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	ExecutionTime  int64   `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	CheckTime      int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState     int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	Checker        int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	ID                   int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId            int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price                float64 `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId            int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64   `gorm:"column:status" json:"status" form:"status"`
+	PatientId            int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate           int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId       int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count                string  `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn            string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Type                 int64   `gorm:"column:type" json:"type" form:"type"`
+	Doctor               int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime        int64   `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff       int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState       int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime            int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState           int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker              int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	ExecutionFrequencyId int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisPrescriptionProjectTwo) TableName() string {

models/his_summary_models.go

@@ -179,39 +179,40 @@ func (VmHisOrderInfo) TableName() string {
 }
 
 type VmHisPrescriptionProject struct {
-	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
-	ProjectId          int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price              float64 `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status             int64   `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId     int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              string  `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg        string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose         string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay        string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                string  `gorm:"column:day" json:"day" form:"day"`
-	Remark             string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string  `gorm:"column:unit" json:"unit" form:"unit"`
-	Type               int64   `gorm:"column:type" json:"type" form:"type"`
-	Doctor             int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	ExecutionTime      int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff     int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState     int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	CheckTime          int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState         int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	Checker            int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	StartTime          int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	TeamId             int64   `gorm:"column:team_id" json:"team_id" form:"team_id"`
-	FrequencyType      int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount           int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay            string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ID                   int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId            int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price                float64 `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId            int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId            int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId         int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate           int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId       int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count                string  `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn            string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg          string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose           string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay          string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency   string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                  string  `gorm:"column:day" json:"day" form:"day"`
+	Remark               string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit                 string  `gorm:"column:unit" json:"unit" form:"unit"`
+	Type                 int64   `gorm:"column:type" json:"type" form:"type"`
+	Doctor               int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime        int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff       int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState       int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime            int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState           int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker              int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime            int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId               int64   `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType        int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ExecutionFrequencyId int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (VmHisPrescriptionProject) TableName() string {
@@ -276,6 +277,7 @@ type VmHisDoctorAdviceInfo struct {
 	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	AdviceId              int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (VmHisDoctorAdviceInfo) TableName() string {

models/stock_models.go

@@ -1309,6 +1309,7 @@ type BloodHisDoctorAdviceInfo struct {
 	Way                   int64                       `gorm:"column:way" json:"way" form:"way"`
 	HospApprFlag          int64                       `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag           int64                       `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ExecutionFrequencyId  int64                       `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (BloodHisDoctorAdviceInfo) TableName() string {
@@ -1316,40 +1317,41 @@ func (BloodHisDoctorAdviceInfo) TableName() string {
 }
 
 type BloodHisPrescriptionProject struct {
-	ID                 int64                          `gorm:"column:id" json:"id" form:"id"`
-	ProjectId          int64                          `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price              float64                        `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId          int64                          `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status             int64                          `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64                          `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64                          `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId          int64                          `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64                          `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate         int64                          `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId     int64                          `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              string                         `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn          string                         `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg        string                         `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose         string                         `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay        string                         `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency string                         `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                string                         `gorm:"column:day" json:"day" form:"day"`
-	Remark             string                         `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string                         `gorm:"column:unit" json:"unit" form:"unit"`
-	Type               int64                          `gorm:"column:type" json:"type" form:"type"`
-	Doctor             int64                          `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	ExecutionTime      int64                          `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff     int64                          `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState     int64                          `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	CheckTime          int64                          `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState         int64                          `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	Checker            int64                          `gorm:"column:checker" json:"checker" form:"checker"`
-	StartTime          int64                          `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	TeamId             int64                          `gorm:"column:team_id" json:"team_id" form:"team_id"`
-	FrequencyType      int64                          `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount           int64                          `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay            string                         `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	ChildDoctorAdvice  []*BloodHisPrescriptionProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ProjectId" json:"child"`
+	ID                   int64                          `gorm:"column:id" json:"id" form:"id"`
+	ProjectId            int64                          `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price                float64                        `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId            int64                          `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64                          `gorm:"column:status" json:"status" form:"status"`
+	Ctime                int64                          `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                int64                          `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId            int64                          `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId         int64                          `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate           int64                          `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId       int64                          `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count                string                         `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn            string                         `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg          string                         `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose           string                         `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay          string                         `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency   string                         `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                  string                         `gorm:"column:day" json:"day" form:"day"`
+	Remark               string                         `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit                 string                         `gorm:"column:unit" json:"unit" form:"unit"`
+	Type                 int64                          `gorm:"column:type" json:"type" form:"type"`
+	Doctor               int64                          `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime        int64                          `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff       int64                          `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState       int64                          `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime            int64                          `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState           int64                          `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker              int64                          `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime            int64                          `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId               int64                          `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType        int64                          `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64                          `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string                         `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ChildDoctorAdvice    []*BloodHisPrescriptionProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ProjectId" json:"child"`
+	ExecutionFrequencyId int64                          `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (BloodHisPrescriptionProject) TableName() string {

service/coordinate_service.go

@@ -8,6 +8,7 @@ import (
 	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"net/http"
+	"time"
 )
 
 func SavePatientMessageInfo() (string, string) {
@@ -329,3 +330,163 @@ func GetHisOrderFour(patient_id string, infoSeq string, docId string) (order mod
 	}
 	return
 }
+
+func GetHisPatientForCoordinate(id_card_no string) (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["idcard"] = id_card_no // 就诊凭证编号
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/getPatientType"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("GET", 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("code", "Xmrjyy")
+
+	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(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+func UploadPrescriptionForCoordinate(info models.UploadInfo) (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	diags := make([]map[string]interface{}, 0)
+	//diags := make([]map[string]interface{}, 0)
+
+	presInfos := make([]map[string]interface{}, 0)
+
+	for _, item := range info.Diag {
+		inputDataDiag := make(map[string]interface{})
+		inputDataDiag["vao06"] = item.Vao06
+		inputDataDiag["bak02"] = item.Bak02
+		diags = append(diags, inputDataDiag)
+	}
+
+	for _, item := range info.PresInfo {
+		inputDataPresInfo := make(map[string]interface{})
+		inputDataPresInfo["cbm06"] = item.Cbm06
+		inputDataPresInfo["cbm07"] = item.Cbm06
+		inputDataPresInfo["cbmid"] = item.Cbmid
+		presDetails := make([]map[string]interface{}, 0)
+
+		for _, subItem := range item.PresDetail {
+			inputDataPresDetail := make(map[string]interface{})
+			inputDataPresDetail["vaf59"] = subItem.Vaf59
+			Items := make([]map[string]interface{}, 0)
+			for _, subSubItem := range subItem.Item {
+				inputDataItem := make(map[string]interface{})
+				inputDataItem["bbx01"] = subSubItem.Bbx01
+				inputDataItem["bda01"] = subSubItem.Bda01
+				inputDataItem["bby01"] = subSubItem.Bby01
+				inputDataItem["bck01b"] = subSubItem.Bck01b
+				inputDataItem["bck01d"] = subSubItem.Bck01d
+				inputDataItem["bdi01"] = subSubItem.Bdi01
+				inputDataItem["rownr"] = subSubItem.Rownr
+				inputDataItem["vaf11"] = subSubItem.Vaf11
+				inputDataItem["vaf14"] = subSubItem.Vaf14
+				inputDataItem["vaf15"] = subSubItem.Vaf15
+				inputDataItem["vaf17"] = subSubItem.Vaf17
+				inputDataItem["vaf18"] = subSubItem.Vaf18
+				inputDataItem["vaf19"] = subSubItem.Vaf19
+				inputDataItem["vaf20"] = subSubItem.Vaf20
+				inputDataItem["vaf21"] = subSubItem.Vaf21
+				inputDataItem["vaf22"] = subSubItem.Vaf22
+				inputDataItem["vaf32"] = subSubItem.Vaf32
+				inputDataItem["vaf35"] = subSubItem.Vaf35
+				inputDataItem["vaf36"] = subSubItem.Vaf36
+				inputDataItem["vaf58"] = subSubItem.Vaf58
+				inputDataItem["vaf61"] = subSubItem.Vaf61
+				Items = append(Items, inputDataItem)
+
+			}
+			inputDataPresDetail["item"] = Items
+			presDetails = append(presDetails, inputDataPresDetail)
+		}
+		inputDataPresInfo["presDetail"] = presDetails
+		presInfos = append(presInfos, inputDataPresInfo)
+	}
+
+	inputData["vaa01"] = info.Vaa01   // 就诊凭证编号
+	inputData["Fasong"] = info.Fasong // 就诊凭证编号
+	inputData["vaa07"] = info.Vaa07   // 就诊凭证编号
+	inputData["bck01c"] = info.Bck01c // 就诊凭证编号
+	inputData["bce02a"] = "1001"      // 就诊凭证编号
+
+	inputData["diag"] = diags         // 就诊凭证编号
+	inputData["presInfo"] = presInfos // 就诊凭证编号
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/sendPretreat"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	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("code", "Xmrjyy")
+
+	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(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+
+func UpDatePrescriptionNumberForCoordinate(user_org_id int64, ids []int64, number string) (err error) {
+	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND status = 1 AND id in (?)", user_org_id, ids).Updates(map[string]interface{}{"batch_number": number, "mtime": time.Now().Unix(), "order_status": 6}).Error
+	return
+}

service/data.go

@@ -343,3 +343,8 @@ func CreateContinueSchedule(schedule *models.ContinueSchedule) error {
 	err := writeDb.Model(&schedule).Create(&schedule).Error
 	return err
 }
+
+func GetExecutionFrequencyByName(name string, org_id int64) (ef models.ExecutionFrequencyDic, err error) {
+	err = readDb.Model(&models.ExecutionFrequencyDic{}).Where("org_id = ? AND name = ?", org_id, name).First(&ef).Error
+	return
+}

service/his_service.go

@@ -1699,6 +1699,7 @@ type HisDoctorAdviceInfo struct {
 	Drug                 Drug                 `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	VMHisPrescriptionTwo VMHisPrescriptionTwo `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"prescription"`
 	IsMedicine           int64                `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId int64                `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -1742,9 +1743,10 @@ type HisPrescriptionProject struct {
 	StartTime      int64 `gorm:"column:start_time" json:"start_time" form:"start_time"`
 	TeamId         int64 `gorm:"column:team_id" json:"team_id" form:"team_id"`
 
-	FrequencyType int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount      int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay       string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ExecutionFrequencyId int64  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisPrescriptionProject) TableName() string {

service/statistics_service/index_evaluation_service.go

@@ -1444,12 +1444,12 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 	userDb := service.UserReadDB()
 	db := service.XTReadDB()
 	//var tempConfig models.Dataconfig
-	offset := (page - 1) * limit
+	//offset := (page - 1) * limit
 
 	//db.Model(&models.Dataconfig{}).Where("name = '血管通路' AND module = 'hemodialysis' AND field_name = 'vascular_access_desc' AND parent_id = 0").First(&tempConfig)
 
 	if admin_user_id == 0 {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where org_id = ?  AND user_type = 3 ", user_org_id).Offset(offset).Limit(limit).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where org_id = ?  AND user_type = 3 ", user_org_id).Scan(&datas)
 	} else {
 		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
@@ -1495,6 +1495,61 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 
 }
 
+//func GetMobilNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int64, admin_user_id int64, page int64, limit int64) (datas []*VMUserAdminRole, AdminTotal int64, err error) {
+//	userDb := service.UserReadDB()
+//	db := service.XTReadDB()
+//	//var tempConfig models.Dataconfig
+//	//offset := (page - 1) * limit
+//
+//	//db.Model(&models.Dataconfig{}).Where("name = '血管通路' AND module = 'hemodialysis' AND field_name = 'vascular_access_desc' AND parent_id = 0").First(&tempConfig)
+//
+//	if admin_user_id == 0 {
+//		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where org_id = ?  AND user_type = 3 ", user_org_id).Scan(&datas)
+//	} else {
+//		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
+//	}
+//
+//	for _, item := range datas {
+//		var Total int64
+//		var TotalTwo int64
+//		var TotalThree int64
+//		var TotalFour int64
+//		var TotalFive int64
+//		var TotalSix int64
+//		var TotalSeven int64
+//		var TotalEghit int64
+//		var TotalNight int64
+//		//db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND FIND_IN_SET('内瘘',config.name) > 0 Where d.user_org_id = ? AND d.assessment_date >=? AND d.assessment_date <= ?  Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.dialysis_date >= ? AND xt_dialysis_order.dialysis_date <= ? ", user_org_id, tempConfig.ID, user_org_id, start_time, end_time, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
+//		//db.Raw("select count(*) as total_one from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND FIND_IN_SET('导管',config.name) > 0 Where  d.user_org_id = ?  AND d.assessment_date >=? AND d.assessment_date <= ?  Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.dialysis_date >= ? AND xt_dialysis_order.dialysis_date <= ? ", user_org_id, tempConfig.ID, user_org_id, start_time, end_time, user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalOne)
+//		db.Table("xt_monitoring_record as monitor ").Joins("join xt_schedule sch On sch.schedule_date = monitor.monitoring_date AND sch.patient_id = monitor.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("monitor.user_org_id = ? AND monitor.status = 1 AND monitor.monitoring_nurse = ? AND monitor.monitoring_date >= ? AND monitor.monitoring_date <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalTwo)
+//		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.puncture_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&Total)
+//		db.Table("xt_treatment_summary as summary").Joins("join xt_schedule sch On sch.schedule_date = summary.assessment_date AND sch.patient_id = summary.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("summary.user_org_id = ? AND summary.status = 1 AND summary.creater = ? AND summary.assessment_date >= ? AND summary.assessment_date <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalThree)
+//
+//		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.change_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalFour)
+//		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.difficult_puncture_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalFive)
+//		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.new_fistula_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalSix)
+//		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.start_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalSeven)
+//		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.finish_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalEghit)
+//		db.Table("xt_dialysis_order as o").Joins("join xt_schedule sch On sch.schedule_date = o.dialysis_date AND sch.patient_id = o.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("o.user_org_id = ? AND o.status = 1  AND o.dialysis_date >= ? AND o.dialysis_date <= ? AND o.washpipe_nurse = ?", user_org_id, start_time, end_time, item.AdminUserId).Count(&TotalNight)
+//
+//		item.PunctureCount = Total
+//		item.CureCount = TotalTwo
+//		item.MissionCount = TotalThree
+//		item.ChangeNuserCount = TotalFour
+//		item.DiffiCultPuntureNuserCount = TotalFive
+//		item.NewNuserCount = TotalSix
+//		item.StartNuserCount = TotalSeven
+//		item.FinshNurserCount = TotalEghit
+//		item.WashpipeNurserCount = TotalNight
+//	}
+//
+//	if err != nil {
+//		return nil, AdminTotal, err
+//	}
+//	return datas, AdminTotal, nil
+//
+//}
+
 //工作量统计
 type AdminUser struct {
 	ID          int64  `gorm:"column:id" json:"id" form:"id"`