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

.idea/vcs.xml

@@ -7,5 +7,6 @@
   </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/golang.org/x/sync" vcs="Git" />
   </component>
-</project>
+</project>

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode =prod
+runmode =dev
 #dev/prod
 
 #

controllers/data_api_controller.go

@@ -1411,16 +1411,18 @@ func (this *DataApiController) ModifyTemplateName() {
 func (this *DataApiController) ModifyFiledIsShow() {
 	id, _ := this.GetInt64("id", 0)
 	is_show, _ := this.GetInt("is_show", 0)
+	is_write, _ := this.GetInt("is_write", 0)
 	adminUserInfo := this.GetAdminUserInfo()
-	err := service.ShowFiledConfig(adminUserInfo.CurrentOrgId, is_show, id)
+	err := service.ShowFiledConfig(adminUserInfo.CurrentOrgId, is_show, is_write, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 		return
 	} else {
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"id":      id,
-			"is_show": is_show,
+			"id":       id,
+			"is_show":  is_show,
+			"is_write": is_write,
 		})
 	}
 }

controllers/dialysis_api_controller.go

@@ -1289,6 +1289,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.MachineRun = data.MachineRun
 	assessment.AfterUrea = data.AfterUrea
 	assessment.PipCoagulation = data.PipCoagulation
+	assessment.AccumulatedBloodVolume = data.AccumulatedBloodVolume
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
@@ -1447,6 +1448,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	blood_pressure_during_dialysis := c.GetString("blood_pressure_during_dialysis")
 	urea_befor := c.GetString("urea_befor")
 	suction := c.GetString("suction")
+	weight_befor_remake := c.GetString("weight_befor_remake")
+
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1515,6 +1518,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		BloodPressureDuringDialysis:    blood_pressure_during_dialysis,
 		UreaBefor:                      urea_befor,
 		Suction:                        suction,
+		WeightBeforRemake:              weight_befor_remake,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)

controllers/dialysis_record_api_controller.go

@@ -1259,6 +1259,13 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
 		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+		//长沙南雅
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
+			//获取最后一条透析处方数据
+			prescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+			evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+			tempassessmentAfterDislysis.WeightAfter = evaluation.WeightBefore - prescription.TargetUltrafiltration
+		}
 		if adminUserInfo.CurrentOrgId == 10101 {
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
 		} else {
@@ -1348,72 +1355,72 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
-	//evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
-	//if evaluation.SystolicBloodPressure == 0 {
-	//	evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
-	//
-	//	pre := models.PredialysisEvaluation{
-	//		SystolicBloodPressure: evaluation.SystolicBloodPressure,
-	//	}
-	//	fmt.Println("prew", pre)
-	//	getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
-	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-	//
-	//	redis := service.RedisClient()
-	//	redis.Set(key, "", time.Second)
-	//	redis.Set(keyOne, "", time.Second)
-	//	defer redis.Close()
-	//	fmt.Println(getNurseErr)
-	//}
-	//if evaluation.DiastolicBloodPressure == 0 {
-	//	evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
-	//	pres := models.PredialysisEvaluation{
-	//		DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
-	//	}
-	//	getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
-	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-	//
-	//	redis := service.RedisClient()
-	//	redis.Set(key, "", time.Second)
-	//
-	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-	//	redis.Set(keyOne, "", time.Second)
-	//	defer redis.Close()
-	//	fmt.Println(getNurseErr)
-	//}
-	//if evaluation.PulseFrequency == 0 {
-	//	evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
-	//	press := models.PredialysisEvaluation{
-	//		PulseFrequency: evaluation.PulseFrequency,
-	//	}
-	//	getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
-	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-	//
-	//	redis := service.RedisClient()
-	//	redis.Set(key, "", time.Second)
-	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-	//	redis.Set(keyOne, "", time.Second)
-	//	defer redis.Close()
-	//	fmt.Println(getNurseErr)
-	//}
-	//
-	//if evaluation.Temperature == 0 {
-	//	evaluation.Temperature = fmonitorRecords.Temperature
-	//	press := models.PredialysisEvaluation{
-	//		Temperature: evaluation.Temperature,
-	//	}
-	//	getNurseErr := service.UpdatePredialysisEvaluationFour(&press, evaluation.ID)
-	//	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
-	//
-	//	redis := service.RedisClient()
-	//	redis.Set(key, "", time.Second)
-	//	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
-	//	redis.Set(keyOne, "", time.Second)
-	//	defer redis.Close()
-	//	fmt.Println(getNurseErr)
-	//}
-	//
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 {
+		fmt.Println("进来2332233333333333333333333333333333333我的")
+		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+		if evaluation.SystolicBloodPressure == 0 {
+			pre := models.PredialysisEvaluation{
+				SystolicBloodPressure: fmonitorRecords.SystolicBloodPressure,
+			}
+			fmt.Println("prew", pre)
+			getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
+			fmt.Println(getNurseErr)
+		}
+		if evaluation.DiastolicBloodPressure == 0 {
+			pres := models.PredialysisEvaluation{
+				DiastolicBloodPressure: fmonitorRecords.DiastolicBloodPressure,
+			}
+			getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+
+			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
+			fmt.Println(getNurseErr)
+		}
+		if evaluation.PulseFrequency == 0 {
+			evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
+			press := models.PredialysisEvaluation{
+				PulseFrequency: evaluation.PulseFrequency,
+			}
+			getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
+			fmt.Println(getNurseErr)
+		}
+
+		if evaluation.Temperature == 0 {
+			evaluation.Temperature = fmonitorRecords.Temperature
+			press := models.PredialysisEvaluation{
+				Temperature: evaluation.Temperature,
+			}
+			getNurseErr := service.UpdatePredialysisEvaluationFour(&press, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_befores_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
+			fmt.Println(getNurseErr)
+		}
+	}
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

controllers/drug_pharmacy_management_controller.go

@@ -469,6 +469,9 @@ func (this *PharmacyApiController) GetReturnPharmacyBaseDrug() {
 func (this *PharmacyApiController) SaveSetting() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}

controllers/his_config_api_controller.go

@@ -6,9 +6,13 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/config"
+	"golang.org/x/sync/errgroup"
 	"reflect"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -16,11 +20,16 @@ type HisConfigApiController struct {
 	BaseAuthAPIController
 }
 
+const (
+	AddTypeDrug    = 1 //药品
+	AddTypeProject = 2 //项目
+)
+
 func HisConfigApiRegistRouters() {
 	beego.Router("/api/his/patient/list", &HisConfigApiController{}, "get:GetAllHisPatientsList")
 	beego.Router("/api/his/prescriptiontemplate/list", &HisConfigApiController{}, "get:GetPrescriptionTemplateList")
 	beego.Router("/api/his/prescriptiontemplate/info", &HisConfigApiController{}, "get:GetPrescriptionTemplateInfo")
-	beego.Router("/api/his/prescriptiontemplate/create", &HisConfigApiController{}, "post:CreatePrescriptionTemplate")
+	beego.Router("/api/his/prescriptiontemplate/create", &HisConfigApiController{}, "post:CreatePrescriptionTemplate") //批量添加
 	beego.Router("/api/his/prescriptiontemplate/delete", &HisConfigApiController{}, "post:DeletePrescriptionTemplate")
 	beego.Router("/api/his/prescriptioninfotemplate/delete", &HisConfigApiController{}, "post:DeletePrescriptionInfoTemplate")
 	beego.Router("/api/his/advicetemplate/delete", &HisConfigApiController{}, "post:DeleteAdviceTemplate")
@@ -35,6 +44,19 @@ func HisConfigApiRegistRouters() {
 	beego.Router("/api/his/projectmodetemplate/delete", &HisConfigApiController{}, "post:DeleteModeProjectTemplate")
 	beego.Router("/api/his/advicempdetemplate/delete", &HisConfigApiController{}, "post:DeleteModeAdviceTemplate")
 	beego.Router("/api/his/prescriptioninfomodetemplate/delete", &HisConfigApiController{}, "post:DeletePrescriptionInfoModeTemplate")
+	beego.Router("/api/his/getdialysismodename", &HisConfigApiController{}, "get:GetDialysisModeName") //根据透析模式获取患者姓名
+	beego.Router("/api/his/getdrugsname", &HisConfigApiController{}, "get:GetDrugsName")               //根据类型获取药品名称
+	beego.Router("/api/his/getmodeconfigs", &HisConfigApiController{}, "get:GetModeConfigs")
+	beego.Router("/api/his/getdrugsinformation", &HisConfigApiController{}, "get:GetDrugsInformation") //根据id获取药品耗材项目基本信息
+	beego.Router("/api/his/replacepeoplename", &HisConfigApiController{}, "get:ReplacePeopleName")     //替换——获取患者名字
+	beego.Router("/api/his/replaceconfig", &HisConfigApiController{}, "get:ReplaceConfig")
+	beego.Router("/api/his/replacesavedrug", &HisConfigApiController{}, "post:ReplaceSaveDrug")          //替换——药品保存
+	beego.Router("/api/his/replacesaveproject", &HisConfigApiController{}, "post:ReplaceSaveProject")    //替换——项目保存
+	beego.Router("/api/his/deletedrugsbatch", &HisConfigApiController{}, "get:DeleteDrugsBatch")         //批量删除——药品
+	beego.Router("/api/his/batchdeleteitems", &HisConfigApiController{}, "get:BatchDeleteItems")         //批量删除——项目
+	beego.Router("/api/his/addstemplate", &HisConfigApiController{}, "post:AddsTemplate")                //批量添加
+	beego.Router("/api/his/ptemplateinformation", &HisConfigApiController{}, "get:PTemplateInformation") //根据患者id、透析模式获取处方模板信息
+	beego.Router("/api/his/deleteone", &HisConfigApiController{}, "get:DeleteOne")                       //删除单条处方模板
 }
 
 func (c *HisConfigApiController) GetAllHisPatientsList() {
@@ -898,3 +920,916 @@ func (c *HisConfigApiController) DeletePrescriptionInfoModeTemplate() {
 		return
 	}
 }
+
+func (c *HisConfigApiController) GetDialysisModeName() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	mode, _ := c.GetInt64("mode")
+	var list []*models.DialysisPatient
+	list, err = service.GetDialysisModePatient(orgid, mode)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+
+}
+func (c *HisConfigApiController) GetDrugsName() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	addtype, _ := c.GetInt("addtype")
+	//special,_ := c.GetInt("special")
+	//tmpBool := false
+	//if special == IsSpecialDiseases{
+	//	tmpBool = true
+	//}
+
+	tmp := make(map[string]interface{}, 0)
+	if addtype == AddTypeDrug {
+		var list []*models.ReplacementDrugs
+		list, err = service.ReplacementDrugs(orgid, true)
+		if err != nil {
+			c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+			return
+		}
+		var list2 []*models.ReplacementDrugs
+		list2, err = service.ReplacementDrugs(orgid, false)
+		if err != nil {
+			c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+			return
+		}
+		tmp["list"] = list
+		tmp["list2"] = list2
+	} else if addtype == AddTypeProject {
+		var list3 []*models.DropDownList
+		list3, err = service.ProjectConsumables2(orgid, true)
+		if err != nil {
+			c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+			return
+		}
+		var list4 []*models.DropDownList
+		list4, err = service.ProjectConsumables2(orgid, false)
+		if err != nil {
+			c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+			return
+		}
+		tmp["list"] = list3
+		tmp["list2"] = list4
+	} else {
+		err = fmt.Errorf("类型解析错误")
+		if err != nil {
+			c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+			return
+		}
+	}
+	c.ServeSuccessJSON(tmp)
+	return
+
+}
+
+//配置项
+func (c *HisConfigApiController) GetModeConfigs() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	var drugways []*models.DrugwayDic
+	var efs []*models.ExecutionFrequencyDic
+	var dataconfig []*models.DictDataconfig
+	drugways, _, err = service.GetDrugWayDics(orgid)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	efs, _, err = service.GetExecutionFrequencyDics(orgid)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	dataconfig, err = service.GetDataConfig(orgid)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"drugways":   drugways,
+		"efs":        efs,
+		"dataconfig": dataconfig, //组
+	})
+	return
+}
+func (c *HisConfigApiController) GetDrugsInformation() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	id := c.GetString("id", "")
+	if len(id) == 0 {
+		err = fmt.Errorf("参数错误")
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	var list interface{}
+	list, err = service.QueryFourTables(id, orgid)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+}
+
+func (c *HisConfigApiController) ReplacePeopleName() {
+	var g errgroup.Group
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	mode, _ := c.GetInt64("mode") //透析模式
+	id := c.GetString("id", "")   //药品/项目/耗材id
+	if id == "" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+	var list []*models.DialysisPatient
+	finlist := make([]*models.DialysisPatient, 0) //筛选后的列表
+	list, err = service.GetDialysisModePatient(orgid, mode)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	for _, v := range list {
+		v := v
+		g.Go(func() error {
+			//判断该患者是否有使用该药品/项目/耗材
+			tmpid := id[:1]
+			bo := false
+			if tmpid == "p" {
+				pid := id[1:]
+				tmpisid, _ := strconv.ParseInt(pid, 10, 64)
+				tp := service.FindPatientXiang(orgid, v.ID, tmpisid, mode)
+				if tp {
+					bo = true
+				}
+
+			} else if tmpid == "i" {
+				pid := id[1:]
+				tmpisid, _ := strconv.ParseInt(pid, 10, 64)
+				tp := service.FindPatientXiang2(orgid, v.ID, tmpisid, mode)
+				if tp {
+					bo = true
+				}
+			} else {
+				pid := id
+				tmpisid, _ := strconv.ParseInt(pid, 10, 64)
+				tp := service.FindPatientDrug(orgid, v.ID, tmpisid, mode)
+				if tp {
+					bo = true
+				}
+			}
+			if bo {
+				finlist = append(finlist, v)
+			}
+			return nil
+		})
+	}
+	if err = g.Wait(); err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": finlist,
+	})
+	return
+}
+func (c *HisConfigApiController) ReplaceConfig() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	tmp := make(map[string]interface{}, 0)
+	var list []*models.ReplacementDrugs
+	var list2 []*models.DropDownList
+	list, err = service.ReplacementDrugsT(orgid)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	tmp["list"] = list
+	list2, err = service.ProjectConsumables2T(orgid)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	tmp["list2"] = list2
+	c.ServeSuccessJSON(tmp)
+	return
+
+}
+
+//批量替换——药品
+func (c *HisConfigApiController) ReplaceSaveDrug() {
+	var g errgroup.Group
+	var err error
+	tx := service.XTWriteDB().Begin()
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	mode_id, _ := c.GetInt64("mode_id", 0)  //透析模式
+	types, _ := c.GetInt64("type", 1)       //1.药品 2.项目
+	patient_id := c.GetString("patient_id") //患者
+	replaced := c.GetString("replaced", "") //被替换的药品、项目、耗材id
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err = json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	t_ids := ""
+	if patient_id[len(patient_id)-1] == 44 {
+		t_ids = patient_id[:len(patient_id)-1]
+	} else {
+		t_ids = patient_id
+	}
+	tmp_id := strings.Split(t_ids, ",")
+	ids := service.GetHisInfoTempalteId(mode_id, orgid, types) //获取所有药品模板id
+	drugid, _ := strconv.ParseInt(replaced, 10, 64)
+	for _, v := range tmp_id {
+		v := v
+		g.Go(func() error {
+			pp, _ := strconv.ParseInt(v, 10, 64) //患者id
+			var err error
+			if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+				prescriptions, _ := dataBody["prescriptions"].([]interface{})
+				if len(prescriptions) > 0 {
+					for _, item := range prescriptions {
+						items := item.(map[string]interface{})
+						var s models.HisPrescriptionAdviceTemplate
+						var tmpdrugid int64
+						if items["drug_name"] != nil && reflect.TypeOf(items["drug_name"]).String() == "string" {
+							tmpdrugid, _ = strconv.ParseInt(items["drug_name"].(string), 10, 64)
+						}
+						if items["drug_name"] != nil && reflect.TypeOf(items["drug_name"]).String() == "float64" {
+							tmpdrugid = int64(items["drug_name"].(float64))
+						}
+						s.AdviceName = service.FindDrugsName(tmpdrugid) //药品名称
+						if items["id"] == nil {
+							err = fmt.Errorf("缺少参数")
+							return err
+						} else {
+							if items["id"] != nil && reflect.TypeOf(items["id"]).String() == "string" {
+								tmp_drugid := items["id"].(string)
+								drug_id, _ := strconv.ParseInt(tmp_drugid, 10, 64)
+								s.DrugId = drug_id //药品id
+							}
+							if items["id"] != nil && reflect.TypeOf(items["id"]).String() == "float64" {
+								drug_id := int64(items["id"].(float64))
+								s.DrugId = drug_id
+							}
+						}
+						if items["remark"] != nil && reflect.TypeOf(items["remark"]).String() == "string" {
+							remark, _ := items["remark"].(string)
+							s.Remark = remark //备注
+						}
+						if items["single_dose"] != nil && reflect.TypeOf(items["single_dose"]).String() == "string" {
+							singleDose, _ := strconv.ParseFloat(items["single_dose"].(string), 64)
+							s.SingleDose = singleDose
+						}
+						if items["single_dose"] != nil && reflect.TypeOf(items["single_dose"]).String() == "float64" {
+							singleDose := items["single_dose"].(float64)
+							s.SingleDose = singleDose
+						}
+						if items["single_dose_unit"] != nil && reflect.TypeOf(items["single_dose_unit"]).String() == "string" {
+							singleDoseUnit, _ := items["single_dose_unit"].(string)
+							s.SingleDoseUnit = singleDoseUnit
+						}
+						if items["prescribing_number"] != nil && reflect.TypeOf(items["prescribing_number"]).String() == "string" {
+							prescribingNumber, _ := strconv.ParseFloat(items["prescribing_number"].(string), 64)
+							s.PrescribingNumber = prescribingNumber
+						}
+						if items["prescribing_number"] != nil && reflect.TypeOf(items["prescribing_number"]).String() == "float64" {
+							prescribingNumber := items["prescribing_number"].(float64)
+							s.PrescribingNumber = prescribingNumber
+						}
+						if items["prescribing_number_unit"] != nil && reflect.TypeOf(items["prescribing_number_unit"]).String() == "string" {
+							prescribingNumberUnit, _ := items["prescribing_number_unit"].(string)
+							s.PrescribingNumberUnit = prescribingNumberUnit
+						}
+						if items["delivery_way"] != nil && reflect.TypeOf(items["delivery_way"]).String() == "string" {
+							deliveryWay, _ := items["delivery_way"].(string)
+							s.DeliveryWay = deliveryWay
+						}
+						if items["execution_frequency"] != nil && reflect.TypeOf(items["execution_frequency"]).String() == "string" {
+							executionFrequency, _ := items["execution_frequency"].(string)
+							s.ExecutionFrequency = executionFrequency
+						}
+						if items["price"] != nil && reflect.TypeOf(items["price"]).String() == "string" {
+							price, _ := strconv.ParseFloat(items["price"].(string), 64)
+							s.Price = price
+						}
+						if items["price"] != nil && reflect.TypeOf(items["price"]).String() == "float64" {
+							price := items["price"].(float64)
+							s.Price = price
+						}
+						if items["day"] != nil && reflect.TypeOf(items["day"]).String() == "string" {
+							day, _ := strconv.ParseInt(items["day"].(string), 10, 64)
+							s.Day = day
+						}
+						if items["day"] != nil && reflect.TypeOf(items["day"]).String() == "float64" {
+							day := int64(items["day"].(float64))
+							s.Day = day
+						}
+						s.FrequencyType = 1
+						err = service.ReplaceDrugPrescriptionTemplate(orgid, pp, drugid, ids, s, tx)
+						if err != nil {
+							return err
+						}
+
+					}
+					return nil
+				}
+			}
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": "替换成功",
+	})
+	return
+}
+
+//批量替换项目
+func (c *HisConfigApiController) ReplaceSaveProject() {
+	var g errgroup.Group
+	var err error
+	tx := service.XTWriteDB().Begin()
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	mode_id, _ := c.GetInt64("mode_id", 0)  //透析模式
+	types, _ := c.GetInt64("type", 2)       //1.药品 2.项目
+	patient_id := c.GetString("patient_id") //患者
+	replaced := c.GetString("replaced", "") //被替换的药品、项目、耗材id
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err = json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	t_ids := ""
+	if patient_id[len(patient_id)-1] == 44 {
+		t_ids = patient_id[:len(patient_id)-1]
+	} else {
+		t_ids = patient_id
+	}
+	tmp_id := strings.Split(t_ids, ",")
+	ids := service.GetHisInfoTempalteId(mode_id, orgid, types) //获取所有药品模板id
+	drugid, _ := strconv.ParseInt(replaced[1:], 10, 64)
+	for _, v := range tmp_id {
+		v := v
+		g.Go(func() error {
+			pp, _ := strconv.ParseInt(v, 10, 64) //患者id
+			var err error
+			if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+				prescriptions, _ := dataBody["prescriptions"].([]interface{})
+				if len(prescriptions) > 0 {
+					for _, item := range prescriptions {
+						items := item.(map[string]interface{})
+						var s models.HisPrescriptionProjectTemplate
+						if items["id"] != nil {
+							id := items["id"].(string)
+							if id != "" {
+								tmpPid := id[1:]
+								project_id, _ := strconv.ParseInt(tmpPid, 10, 64)
+								if id[0] == 112 {
+									s.Type = 2
+								}
+								if id[0] == 105 {
+									s.Type = 3
+								}
+								s.ProjectId = project_id
+							} else {
+								s.ProjectId = int64(0)
+							}
+
+						}
+						if items["frequency_type"] != nil && reflect.TypeOf(items["frequency_type"]).String() == "string" {
+							tmp_drugid := items["frequency_type"].(string)
+							frequency_type, _ := strconv.ParseInt(tmp_drugid, 10, 64)
+							s.FrequencyType = frequency_type
+						}
+						if items["frequency_type"] != nil && reflect.TypeOf(items["frequency_type"]).String() == "float64" {
+							frequency_type := int64(items["frequency_type"].(float64))
+							s.FrequencyType = frequency_type
+						}
+						if items["day_count"] != nil && reflect.TypeOf(items["day_count"]).String() == "string" {
+							tmp_drugid := items["day_count"].(string)
+							day_count, _ := strconv.ParseInt(tmp_drugid, 10, 64)
+							s.DayCount = day_count
+						}
+						if items["day_count"] != nil && reflect.TypeOf(items["day_count"]).String() == "float64" {
+							day_count := int64(items["day_count"].(float64))
+							s.DayCount = day_count
+						}
+						if items["week_day"] != nil && reflect.TypeOf(items["week_day"]).String() == "string" {
+							week_day, _ := items["week_day"].(string)
+							s.WeekDay = week_day
+						}
+						if items["week_day"] != nil && reflect.TypeOf(items["week_day"]).String() == "float64" {
+							week_day := config.ToString(items["week_day"].(float64))
+							s.WeekDay = week_day
+						}
+						if items["price"] != nil && reflect.TypeOf(items["price"]).String() == "string" {
+							price, _ := strconv.ParseFloat(items["price"].(string), 64)
+							s.Price = price
+						}
+
+						if items["price"] != nil && reflect.TypeOf(items["price"]).String() == "float64" {
+							price := items["price"].(float64)
+							s.Price = price
+						}
+						if items["prescribing_number"] != nil && reflect.TypeOf(items["prescribing_number"]).String() == "string" {
+							total, _ := items["prescribing_number"].(string)
+							//totals, _ := strconv.ParseInt(total, 10, 64)
+							s.Count = total
+						}
+						if items["prescribing_number"] != nil && reflect.TypeOf(items["prescribing_number"]).String() == "float64" {
+							total := config.ToString(items["prescribing_number"].(float64))
+							//totals, _ := strconv.ParseInt(total, 10, 64)
+							s.Count = total
+						}
+						if items["single_dose"] != nil && reflect.TypeOf(items["single_dose"]).String() == "string" {
+							single_dose, _ := items["single_dose"].(string)
+							s.SingleDose = single_dose
+						}
+						if items["single_dose"] != nil && reflect.TypeOf(items["single_dose"]).String() == "float64" {
+							single_dose := config.ToString(items["single_dose"].(float64))
+							s.SingleDose = single_dose
+						}
+						if items["delivery_way"] != nil && reflect.TypeOf(items["delivery_way"]).String() == "string" {
+							delivery_way, _ := items["delivery_way"].(string)
+							s.DeliveryWay = delivery_way
+						}
+						if items["execution_frequency"] != nil && reflect.TypeOf(items["execution_frequency"]).String() == "string" {
+							execution_frequency, _ := items["execution_frequency"].(string)
+							s.ExecutionFrequency = execution_frequency
+						}
+						if items["remark"] != nil && reflect.TypeOf(items["remark"]).String() == "string" {
+							remark, _ := items["remark"].(string)
+							s.Remark = remark
+						}
+						if items["day"] != nil && reflect.TypeOf(items["remark"]).String() == "string" {
+							day, _ := items["number_days"].(string)
+							s.Day = day
+						}
+						if items["day"] != nil && reflect.TypeOf(items["remark"]).String() == "float64" {
+							day := config.ToString(items["number_days"].(float64))
+							s.Day = day
+						}
+
+						if items["unit"] != nil && reflect.TypeOf(items["unit"]).String() == "string" {
+							unit, _ := items["unit"].(string)
+							s.Unit = unit
+						}
+						err = service.ReplaceProjectPrescriptionTemplate(orgid, pp, drugid, ids, s, tx)
+						if err != nil {
+							return err
+						}
+
+					}
+					return nil
+				}
+			}
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": "替换成功",
+	})
+	return
+}
+
+//批量删除项目
+func (c *HisConfigApiController) BatchDeleteItems() {
+	var g errgroup.Group
+	var err error
+	tx := service.XTWriteDB().Begin()
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	mode_id, _ := c.GetInt64("mode_id", 0)  //透析模式
+	types, _ := c.GetInt64("type", 2)       //1.药品 2.项目
+	patient_id := c.GetString("patient_id") //患者
+	replaced := c.GetString("replaced", "") //被删除的药品、项目、耗材id
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	t_ids := ""
+	if patient_id[len(patient_id)-1] == 44 {
+		t_ids = patient_id[:len(patient_id)-1]
+	} else {
+		t_ids = patient_id
+	}
+	tmp_id := strings.Split(t_ids, ",")
+	ids := service.GetHisInfoTempalteId(mode_id, orgid, types) //获取所有药品模板id
+	drugid, _ := strconv.ParseInt(replaced[1:], 10, 64)
+	for _, v := range tmp_id {
+		v := v
+		g.Go(func() error {
+			pp, _ := strconv.ParseInt(v, 10, 64) //患者id
+			var err error
+			err = service.DeleteProjectTemplate(orgid, pp, drugid, ids, tx)
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": "删除成功",
+	})
+	return
+}
+
+//批量删除药品
+func (c *HisConfigApiController) DeleteDrugsBatch() {
+	var g errgroup.Group
+	var err error
+	tx := service.XTWriteDB().Begin()
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	mode_id, _ := c.GetInt64("mode_id", 0)  //透析模式
+	types, _ := c.GetInt64("type", 1)       //1.药品 2.项目
+	patient_id := c.GetString("patient_id") //患者
+	replaced := c.GetString("replaced", "") //被替换的药品、项目、耗材id
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	t_ids := ""
+	if patient_id[len(patient_id)-1] == 44 {
+		t_ids = patient_id[:len(patient_id)-1]
+	} else {
+		t_ids = patient_id
+	}
+	tmp_id := strings.Split(t_ids, ",")
+	ids := service.GetHisInfoTempalteId(mode_id, orgid, types) //获取所有药品模板id
+	drugid, _ := strconv.ParseInt(replaced, 10, 64)
+	for _, v := range tmp_id {
+		v := v
+		g.Go(func() error {
+			pp, _ := strconv.ParseInt(v, 10, 64) //患者id
+			var err error
+			err = service.DeletePrescriptionTemplate(orgid, pp, drugid, ids, tx)
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": "删除成功",
+	})
+	return
+}
+
+//批量添加
+func (c *HisConfigApiController) AddsTemplate() {
+	var g errgroup.Group
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
+	//id, _ := c.GetInt64("id")
+	name := c.GetString("name", "")
+	mode_id, _ := c.GetInt64("mode_id", 0)
+	types, _ := c.GetInt64("type", 1) //没啥用
+	patient_id := c.GetString("patient_id")
+	//patient_id, _ := c.GetInt64("patient_id", 0)
+	if name == "" {
+		name = service.DialysisModeName(mode_id)
+	}
+	adminInfo := c.GetAdminUserInfo()
+	dataBody := make(map[string]interface{}, 0)
+	err = json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	t_ids := ""
+	if patient_id[len(patient_id)-1] == 44 {
+		t_ids = patient_id[:len(patient_id)-1]
+	} else {
+		t_ids = patient_id
+	}
+	tmp_id := strings.Split(t_ids, ",")
+	for _, v := range tmp_id {
+		v := v
+		g.Go(func() error {
+			var err error
+			pa, _ := strconv.ParseInt(v, 10, 64)
+			tmp_bool_id := service.IsDialysisMode(adminInfo.CurrentOrgId, pa, mode_id)
+
+			var src_template models.HisPrescriptionTemplate
+			if !tmp_bool_id {
+				template := models.HisPrescriptionTemplate{
+					UserOrgId: adminInfo.CurrentOrgId,
+					PatientId: pa,
+					Type:      types,
+					Status:    1,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+					Name:      name,
+					Mode:      mode_id,
+				}
+				src_template = template
+				service.CreateHisPrescriptionTemplate(&src_template)
+			} else {
+				//查询出该模板的id
+				src_template, err = service.IdOfTheTemplate(adminInfo.CurrentOrgId, pa, mode_id)
+				if err != nil {
+					return err
+				}
+				src_template.Name = name
+				src_template.Mode = mode_id
+				service.SaveHisPrescriptionTemplate(&src_template)
+			}
+
+			if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+				prescriptions, _ := dataBody["prescriptions"].([]interface{})
+				if len(prescriptions) > 0 {
+					for _, item := range prescriptions {
+						items := item.(map[string]interface{})
+
+						id := int64(0)
+						//fmt.Println("111111111111111111111")
+						//if items["type"] == nil {
+						//	utils.ErrorLog("type")
+						//	//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						//	fmt.Println("222222222222222")
+						//	err = fmt.Errorf("参数错误")
+						//	return err
+						//}
+						//fmt.Println("33333333333")
+						//type1 := types
+						med_type := ""
+						var tmps float64
+						if items["patient_value"] != nil && reflect.TypeOf(items["patient_value"]).String() == "float64" {
+							tmps = items["patient_value"].(float64)
+						}
+						if items["patient_value"] != nil && reflect.TypeOf(items["patient_value"]).String() == "string" {
+							tmps, _ = strconv.ParseFloat(items["patient_value"].(string), 64)
+						}
+						if tmps == 1 {
+							med_type = "11"
+						} else if tmps == 2 {
+							med_type = "14"
+						} else {
+							err = fmt.Errorf("医疗类型参数错误")
+						}
+
+						ctime := time.Now().Unix()
+						prescription := &models.HisPrescriptionInfoTemplate{
+							ID:          id,
+							PatientId:   pa,
+							UserOrgId:   adminInfo.CurrentOrgId,
+							Ctime:       ctime,
+							Mtime:       ctime,
+							Type:        types,
+							Modifier:    adminInfo.AdminUser.Id,
+							Creator:     adminInfo.AdminUser.Id,
+							Status:      1,
+							PTemplateId: src_template.ID,
+							MedType:     med_type,
+						}
+						service.CreateHisPrescriptionInfoTemplate(prescription)
+
+						if items["tableDatas"] != nil && reflect.TypeOf(items["tableDatas"]).String() == "[]interface {}" {
+							advices := items["tableDatas"].([]interface{})
+							//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+							groupNo := int64(0)
+							ctime := time.Now().Unix()
+							mtime := ctime
+							if len(advices) > 0 {
+								for k, advice := range advices {
+									var s models.HisPrescriptionAdviceTemplate
+									s.PrescriptionId = prescription.ID
+									s.AdviceType = 2
+									s.StopState = 2
+									s.ExecutionState = 2
+									s.Status = 1
+									s.UserOrgId = adminInfo.CurrentOrgId
+									s.Groupno = groupNo
+									s.CreatedTime = ctime
+									s.UpdatedTime = mtime
+									s.PatientId = pa
+									errcode := service.FensetAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
+									if errcode > 0 {
+										//c.ServeFailJSONWithSGJErrorCode(errcode)
+										err = fmt.Errorf("参数错误")
+										return err
+									}
+									if s.FrequencyType == 0 {
+										s.FrequencyType = 1
+									}
+									s.Groupno = int64(k + 1) //序号
+									if s.DrugId != 0 {
+										service.CreateHisPrescriptionAdviceTemplate(&s)
+									}
+								}
+							}
+						}
+						if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+							projects := items["project"].([]interface{})
+							if len(projects) > 0 {
+								for _, project := range projects {
+									var p models.HisPrescriptionProjectTemplate
+									p.PrescriptionId = prescription.ID
+									p.Ctime = time.Now().Unix()
+									p.Mtime = time.Now().Unix()
+									p.PatientId = pa
+									p.UserOrgId = adminInfo.CurrentOrgId
+									p.Status = 1
+									errcode := service.FensetProjectTemplateWithJSON(&p, project.(map[string]interface{}))
+									if errcode > 0 {
+										//c.ServeFailJSONWithSGJErrorCode(errcode)
+										err = fmt.Errorf("参数错误")
+										return err
+									}
+									if p.FrequencyType == 0 {
+										p.FrequencyType = 1
+									}
+									if p.ProjectId != 0 {
+										service.CreateHisPrescriptionProjectTemplate(&p)
+									}
+
+								}
+							}
+						}
+					}
+					return nil
+				}
+			}
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": "创建成功",
+	})
+	return
+
+}
+
+//根据透析模式和患者id获取该患者的处方内容
+func (c *HisConfigApiController) PTemplateInformation() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	mode_id, _ := c.GetInt64("mode_id", 0)    //透析模式
+	patient_id, _ := c.GetInt64("patient_id") //患者
+	list, err := service.PTemplateInformation(orgid, mode_id, patient_id)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+}
+
+//删除单条记录
+func (c *HisConfigApiController) DeleteOne() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
+	types, _ := c.GetInt64("type") //透析模式
+	id, _ := c.GetInt64("id")      //患者
+	err = service.DeleteOne(types, id)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	err = service.Scavenger(orgid)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": "成功",
+	})
+	return
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -412,6 +412,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	go func() {
 		doctorAdvices, _ = service.MobileGetDoctorAdvicesByGroups(adminInfo.Org.Id, patientID, date.Unix())
+
 		ch <- struct{}{}
 	}()
 
@@ -573,7 +574,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	if is_advice_open.IsAdviceOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
-
+	fmt.Println("doctorAdvices23344334344433434334343434wode", doctorAdvices)
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -1066,6 +1067,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	machine_run := c.GetString("machine_run")
 	after_urea := c.GetString("after_urea")
 	pip_coagulation := c.GetString("pip_coagulation")
+	accumulated_blood_volume := c.GetString("accumulated_blood_volume")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1169,6 +1171,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		MachineRun:                   machine_run,
 		AfterUrea:                    after_urea,
 		PipCoagulation:               pip_coagulation,
+		AccumulatedBloodVolume:       accumulated_blood_volume,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -1754,6 +1757,14 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.UserOrgId = adminUserInfo.Org.Id
 	}
 
+	//长沙南雅
+	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10340 {
+		//获取最后一条透析处方数据
+		prescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
+		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
+		tempassessmentAfterDislysis.WeightAfter = evaluation.WeightBefore - prescription.TargetUltrafiltration
+	}
+
 	if dialysisOrder.Stage == 1 {
 		temp_time := (float64(endDate.Unix()) - float64(dialysisOrder.StartTime)) / 3600
 		value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", temp_time), 64)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2740,6 +2740,11 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		evaluation.Suction = suction
 	}
+	if dataBody["weight_befor_remake"] != nil && reflect.TypeOf(dataBody["weight_befor_remake"]).String() == "string" {
+		weight_befor_remake := dataBody["weight_befor_remake"].(string)
+
+		evaluation.WeightBeforRemake = weight_befor_remake
+	}
 	return
 }
 
@@ -3357,7 +3362,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 	//临时医嘱
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
-
+	fmt.Println("DoctorAdvice3223323323232323223323323223332232332wode", DoctorAdvice)
 	hisAdvice, err := service.GetHisDoctorPatientById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	config, err := service.GetHisDoctorConfig(adminUserInfo.Org.Id)
 

controllers/patient_api_controller.go

@@ -82,6 +82,15 @@ func PatientApiRegistRouters() {
 
 //GetPatientsList 取患者列表
 func (c *PatientApiController) GetPatientsList() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
 	schedulType, _ := c.GetInt64("schedul_type", 0)
@@ -132,7 +141,9 @@ func (c *PatientApiController) GetPatientsList() {
 		theEndtTIme = theTime.Unix()
 	}
 
-	patients, total, _ := service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime)
+	var patients []*models.Patients
+	var total int64
+	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,
@@ -1103,7 +1114,15 @@ func (c *PatientApiController) CreateDryWeights() {
 }
 
 func (c *PatientApiController) CreateGroupAdvice() {
-
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(c.GetAdminUserInfo().CurrentOrgId, c.Ctx.Input, err)
+		}
+	}()
 	patient, _ := c.GetInt64("id", 0)
 	groupNo, _ := c.GetInt64("groupno", 0)
 
@@ -1113,14 +1132,15 @@ func (c *PatientApiController) CreateGroupAdvice() {
 	}
 
 	adminUserInfo := c.GetAdminUserInfo()
-	patientInfo, _ := service.FindPatientById(adminUserInfo.CurrentOrgId, patient)
+	var patientInfo models.Patients
+	patientInfo, err = service.FindPatientById(adminUserInfo.CurrentOrgId, patient)
 	if patientInfo.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
 		return
 	}
 
 	dataBody := make(map[string]interface{}, 0)
-	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	err = json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)

controllers/pharmacy_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"fmt"
 	"github.com/astaxie/beego"
 	"time"
 )
@@ -15,36 +16,42 @@ type PharmacyController struct {
 
 func PharmacyApiRegistRouters() {
 	beego.Router("/api/pharmacy/ceshili", &PharmacyController{}, "get:Tlili")
-	beego.Router("/api/pharmacy/todaynumber", &PharmacyController{}, "get:TodayNumber")                   //查询今天的待发药，已发药人数（
-	beego.Router("/api/pharmacy/waitingdrug", &PharmacyController{}, "get:WaitingDrug")                   //获取当天待发药的所有患者（
-	beego.Router("/api/pharmacy/issueddrugs", &PharmacyController{}, "get:IssuedDrug")                    //获取当天已发药的所有患者（
-	beego.Router("/api/pharmacy/getpharmacycontent", &PharmacyController{}, "get:GetPharmacyContent")     //获取当天该患者的所有信息（
-	beego.Router("/api/pharmacy/dispensingmedicine", &PharmacyController{}, "get:DispensingMedicine")     //患者发药按钮点击（
-	beego.Router("/api/pharmacy/drugwithdrawal", &PharmacyController{}, "get:DrugWithdrawal")             //退药按钮点击
-	beego.Router("/api/pharmacy/dispensingdetails", &PharmacyController{}, "get:DispensingDetails")       //获取发药明细的患者列表(
-	beego.Router("/api/pharmacy/prescriptiondetails", &PharmacyController{}, "get:PrescriptionDetails")   //发药明细-详情(
-	beego.Router("/api/pharmacy/dispensemedicine", &PharmacyController{}, "get:DispenseMedicine")         //获取当天已发药的药品(
-	beego.Router("/api/pharmacy/waitingmedicine", &PharmacyController{}, "get:WaitingMedicine")           //获取当天待发药的药品(
-	beego.Router("/api/pharmacy/getpatientswithdrugs", &PharmacyController{}, "get:GetPatientsWithDrugs") //获取当天该药品的所有患者(
-	beego.Router("/api/pharmacy/medicinedeparture", &PharmacyController{}, "get:MedicineDeparture")       //药品发药按钮点击(
-	beego.Router("/api/pharmacy/getcurrentname", &PharmacyController{}, "get:GetCurrentName")             //获取当前登录账号的名字(
+	beego.Router("/api/pharmacy/todaynumber", &PharmacyController{}, "get:TodayNumber")                     //查询今天的待发药，已发药人数（
+	beego.Router("/api/pharmacy/waitingdrug", &PharmacyController{}, "get:WaitingDrug")                     //获取当天待发药的所有患者（
+	beego.Router("/api/pharmacy/issueddrugs", &PharmacyController{}, "get:IssuedDrug")                      //获取当天已发药的所有患者（
+	beego.Router("/api/pharmacy/getpharmacycontent", &PharmacyController{}, "get:GetPharmacyContent")       //获取当天该患者的所有信息（
+	beego.Router("/api/pharmacy/dispensingmedicine", &PharmacyController{}, "get:DispensingMedicine")       //患者发药按钮点击（
+	beego.Router("/api/pharmacy/drugwithdrawal", &PharmacyController{}, "get:DrugWithdrawal")               //退药按钮点击
+	beego.Router("/api/pharmacy/dispensingdetails", &PharmacyController{}, "get:DispensingDetails")         //获取发药明细的患者列表(
+	beego.Router("/api/pharmacy/prescriptiondetails", &PharmacyController{}, "get:PrescriptionDetails")     //发药明细-详情(
+	beego.Router("/api/pharmacy/dispensemedicine", &PharmacyController{}, "get:DispenseMedicine")           //获取当天已发药的药品(
+	beego.Router("/api/pharmacy/waitingmedicine", &PharmacyController{}, "get:WaitingMedicine")             //获取当天待发药的药品(
+	beego.Router("/api/pharmacy/getpatientswithdrugs", &PharmacyController{}, "get:GetPatientsWithDrugs")   //获取当天该药品的所有患者(
+	beego.Router("/api/pharmacy/medicinedeparture", &PharmacyController{}, "get:MedicineDeparture")         //药品发药按钮点击(
+	beego.Router("/api/pharmacy/getcurrentname", &PharmacyController{}, "get:GetCurrentName")               //获取当前登录账号的名字(
+	beego.Router("/api/pharmacy/getpartitionlist", &PharmacyController{}, "get:GetPartitionList")           //获取当前机构的分区列表
+	beego.Router("/api/pharmacy/routeofadministration", &PharmacyController{}, "get:RouteOfAdministration") //获取当前机构的给药途径
 }
+
+//测试
 func (this *PharmacyController) Tlili() {
-	times := this.GetString("time", "")
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	var stime, etime int64
-	if times == "" {
-		stime, etime = service.GetNowTime()
-	} else {
-		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
-		stime = stmp.Unix()
-		etime = stime + 86399
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
+		}
+	}()
+	var list2 []*models.ReplacementDrugs
+	list2, err = service.ReplacementDrugs(9675, false)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
 	}
-	orgid := this.GetAdminUserInfo().CurrentOrgId
-	service.InitDrugidIsNil(orgid, stime, etime)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": "err",
+		"list": list2,
 	})
 	return
 }
@@ -60,6 +67,9 @@ func (this *PharmacyController) GetCurrentName() {
 func (this *PharmacyController) TodayNumber() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -68,6 +78,16 @@ func (this *PharmacyController) TodayNumber() {
 	times := this.GetString("time", "")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+	//shift, err := this.GetInt64("shift", 0) //班次
+	//if err != nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+	//partition, err := this.GetInt64("partition", 0) //分区
+	//if err != nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 	var stime, etime int64
 	if times == "" {
 		stime, etime = service.GetNowTime()
@@ -100,6 +120,9 @@ func (this *PharmacyController) TodayNumber() {
 func (this *PharmacyController) IssuedDrug() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -107,6 +130,16 @@ func (this *PharmacyController) IssuedDrug() {
 	keyword := this.GetString("keyword", "")
 	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
+	shift, err := this.GetInt64("shift", 0) //班次
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	partition, err := this.GetInt64("partition", 0) //分区
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var stime, etime int64
@@ -125,20 +158,39 @@ func (this *PharmacyController) IssuedDrug() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": flist,
+		"list": listt,
 	})
 	return
 }
 func (this *PharmacyController) WaitingDrug() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
 	}()
 	keyword := this.GetString("keyword", "")
 	times := this.GetString("time", "")
+	shift, err := this.GetInt64("shift", 0) //班次
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	partition, err := this.GetInt64("partition", 0) //分区
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -158,8 +210,14 @@ func (this *PharmacyController) WaitingDrug() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": flist,
+		"list": listt,
 	})
 	return
 }
@@ -168,6 +226,9 @@ func (this *PharmacyController) WaitingDrug() {
 func (this *PharmacyController) GetPharmacyContent() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -207,6 +268,9 @@ func (this *PharmacyController) GetPharmacyContent() {
 func (this *PharmacyController) DispensingMedicine() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -241,6 +305,9 @@ func (this *PharmacyController) DispensingMedicine() {
 func (this *PharmacyController) DrugWithdrawal() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -276,6 +343,9 @@ func (this *PharmacyController) DrugWithdrawal() {
 func (this *PharmacyController) DispensingDetails() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -321,6 +391,9 @@ func (this *PharmacyController) DispensingDetails() {
 func (this *PharmacyController) PrescriptionDetails() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -351,6 +424,9 @@ func (this *PharmacyController) PrescriptionDetails() {
 func (this *PharmacyController) DispenseMedicine() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -360,6 +436,7 @@ func (this *PharmacyController) DispenseMedicine() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+	deliveryway := this.GetString("deliveryway", "")
 	var stime, etime int64
 	if times == "" {
 		stime, etime = service.GetNowTime()
@@ -376,8 +453,14 @@ func (this *PharmacyController) DispenseMedicine() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
 	}
+	llist, err := service.Administration(deliveryway, orgid, flist)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": flist,
+		"list": llist,
 	})
 	return
 }
@@ -386,6 +469,9 @@ func (this *PharmacyController) DispenseMedicine() {
 func (this *PharmacyController) WaitingMedicine() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -395,6 +481,7 @@ func (this *PharmacyController) WaitingMedicine() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+	deliveryway := this.GetString("deliveryway", "")
 	var stime, etime int64
 	if times == "" {
 		stime, etime = service.GetNowTime()
@@ -411,8 +498,14 @@ func (this *PharmacyController) WaitingMedicine() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	llist, err := service.Administration(deliveryway, orgid, flist)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": flist,
+		"list": llist,
 	})
 	return
 }
@@ -421,6 +514,9 @@ func (this *PharmacyController) WaitingMedicine() {
 func (this *PharmacyController) GetPatientsWithDrugs() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -429,6 +525,21 @@ func (this *PharmacyController) GetPatientsWithDrugs() {
 	is_medicine, _ := this.GetInt64("is_medicine", 0) //0：待发药，1：已发药
 	times := this.GetString("time", "")
 	orgid := this.GetAdminUserInfo().CurrentOrgId
+	deliveryway := this.GetString("deliveryway", "")
+	if deliveryway == "" {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	shift, err := this.GetInt64("shift", 0) //班次
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	partition, err := this.GetInt64("partition", 0) //分区
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var stime, etime int64
@@ -446,8 +557,21 @@ func (this *PharmacyController) GetPatientsWithDrugs() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	listll, err := service.PartitionAndLayoutDrug(deliveryway, stime, etime, orgid, shift, partition, list)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	total, err := service.CalculateTheTotalAmount(listll, drug_id)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":  listll,
+		"total": total,
 	})
 	return
 }
@@ -456,6 +580,9 @@ func (this *PharmacyController) GetPatientsWithDrugs() {
 func (this *PharmacyController) MedicineDeparture() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}
@@ -477,3 +604,49 @@ func (this *PharmacyController) MedicineDeparture() {
 	})
 	return
 }
+
+func (this *PharmacyController) GetPartitionList() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
+		}
+	}()
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	tmp := []*models.DeviceZone{{ID: 0, Name: "全部分区"}}
+	list, err := service.GetAllValidDeviceZones02(orgid)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": append(tmp, list...),
+	})
+	return
+}
+
+func (this *PharmacyController) RouteOfAdministration() {
+	var err error
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
+		if err != nil {
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
+		}
+	}()
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	tmp := []*models.DrugwayDic{{ID: 0, Name: "全部"}}
+	list, _, err := service.GetDrugWayDics(orgid)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": append(tmp, list...),
+	})
+	return
+}

controllers/stock_in_api_controller.go

@@ -7021,7 +7021,6 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 	//更改审核状态
 	err := service.UpdateCheckWarehouseInfo(warehousing_info_id)
 	if err == nil {
-
 		list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
 		Creator := this.GetAdminUserInfo().AdminUser.Id
 		for _, item := range list {

controllers/supply_order_api_contorller.go

@@ -125,6 +125,9 @@ func CheckParams(this *SupplyOrderApiController, m *map[string][]string) (map[st
 func (this *SupplyOrderApiController) GetSupplyList() {
 	var err error
 	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("程序异常：%v", rec)
+		}
 		if err != nil {
 			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
 		}

models/data_models.go

@@ -152,6 +152,7 @@ type FiledConfig struct {
 	CreateTime  int64  `gorm:"column:create_time" json:"create_time"`
 	UpdateTime  int64  `gorm:"column:update_time" json:"update_time"`
 	SysModule   int64  `gorm:"column:sys_module" json:"sys_module" form:"sys_module"`
+	IsWrite     int64  `gorm:"column:is_write" json:"is_write" form:"is_write"`
 }
 
 func (FiledConfig) TableName() string {

models/device_models.go

@@ -107,9 +107,9 @@ type DeviceZone struct {
 	OrgID      int64  `gorm:"column:org_id" json:"-"`
 	Name       string `json:"name"`
 	Type       int    `json:"type"`
-	Status     int8   `json:"-"`
 	CreateTime int64  `gorm:"column:ctime" json:"-"`
 	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
 }
 
 func (DeviceZone) TableName() string {

models/dialysis.go

@@ -320,6 +320,7 @@ type PredialysisEvaluation struct {
 	BloodPressureDuringDialysis    string  `gorm:"column:blood_pressure_during_dialysis" json:"blood_pressure_during_dialysis" form:"blood_pressure_during_dialysis"`
 	UreaBefor                      string  `gorm:"column:urea_befor" json:"urea_befor" form:"urea_befor"`
 	Suction                        string  `gorm:"column:suction" json:"suction" form:"suction"`
+	WeightBeforRemake              string  `gorm:"column:weight_befor_remake" json:"weight_befor_remake" form:"weight_befor_remake"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -640,6 +641,7 @@ type AssessmentAfterDislysis struct {
 	MachineRun                      string  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
 	AfterUrea                       string  `gorm:"column:after_urea" json:"after_urea" form:"after_urea"`
 	PipCoagulation                  string  `gorm:"column:pip_coagulation" json:"pip_coagulation" form:"pip_coagulation"`
+	AccumulatedBloodVolume          string  `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {

models/pharmacy_models.go

@@ -2,183 +2,192 @@ package models
 
 //药房表
 type Pharmary 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"`
-	PatientId  int64	`gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Ctime 		int64	`gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime 		int64	`gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status 		int64	`gorm:"column:status" json:"status" form:"status"`
-	RecordDate  int64	`gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime      int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
 }
 
-func (Pharmary)TableName() string {
+func (Pharmary) TableName() string {
 	return "sgj_xt.xt_pharmacy"
 }
 
 type XtErrs struct {
-	OrgId			int64	`gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Route			string	`gorm:"column:route" json:"route" form:"route"`
-	Parameter		string	`gorm:"column:parameter" json:"parameter" form:"parameter"`
-	Text_err		string	`gorm:"column:text_err" json:"text_err" form:"text_err"`
+	OrgId     int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Route     string `gorm:"column:route" json:"route" form:"route"`
+	Parameter string `gorm:"column:parameter" json:"parameter" form:"parameter"`
+	Text_err  string `gorm:"column:text_err" json:"text_err" form:"text_err"`
 }
-func (XtErrs)TableName() string {
+
+func (XtErrs) TableName() string {
 	return "sgj_xt.xt_errs"
 }
 
 //病人
 type TmpPatient struct {
-	PatientID int64
-	Name string
-	DialysisNo string	//透析号
+	PatientID  int64
+	Name       string
+	DialysisNo string //透析号
 }
 
 //药品信息
 type PharmacyContent struct {
-	Name string		//名称
+	Name         string //名称
 	SingleDosage string //单次用量
-	Usage string	//用法
-	Frequency string //频率
-	Days string	//天数
-	Total string //总量
-	Doctor string	//开立医生
-	DataSources string	//数据来源
-	Remarks string	//备注
+	Usage        string //用法
+	Frequency    string //频率
+	Days         string //天数
+	Total        string //总量
+	Doctor       string //开立医生
+	DataSources  string //数据来源
+	Remarks      string //备注
 }
+
 //发药明细列表
 type DispensingList struct {
-	PatientID int64	//	患者id
-	Name string	//患者姓名
-	DoctorId	int64	//医生id
-	DoctorName string	//医生姓名
-	RecordTime	int64	//发药时间(转化前)
-	RecordDate 	string	//发药时间(转化后)
+	PatientID  int64  //	患者id
+	Name       string //患者姓名
+	DoctorId   int64  //医生id
+	DoctorName string //医生姓名
+	RecordTime int64  //发药时间(转化前)
+	RecordDate string //发药时间(转化后)
 }
 type PrescripDetailsList struct {
 	Name string //处方名
-	Id int64	//处方id
+	Id   int64  //处方id
 	Pres []*PrescripDetails
 }
+
 //处方详情
 type PrescripDetails struct {
-	Drugname string		//药品名称
+	Drugname     string //药品名称
 	SingleDosage string //单次用量
-	Usage string	//用法
-	Frequency string //频率
-	Days string	//天数
-	Total string //总量
-	UnitPrice string//单价
-	Remarks string	//备注
+	Usage        string //用法
+	Frequency    string //频率
+	Days         string //天数
+	Total        string //总量
+	UnitPrice    string //单价
+	Remarks      string //备注
 }
+
 //临时医嘱
 type StatOrder struct {
-	StartTime string//开始时间
-	Name string//医嘱名称
-	Specifications string //药品规格
-	PreQuantity string//开药数量
-	SingleDosage string//单次用量
-	RouteOfAdministration string//给药途径
-	ExecutionFrequency string//执行频率
+	StartTime             string //开始时间
+	Name                  string //医嘱名称
+	Specifications        string //药品规格
+	PreQuantity           string //开药数量
+	SingleDosage          string //单次用量
+	RouteOfAdministration string //给药途径
+	ExecutionFrequency    string //执行频率
 }
+
 //退库用的结构体
 type SpecialForStock struct {
-	BatchNumber 		string	`json:"batch_number"`
-	BatchNumberId		int64	`json:"batch_number_id"`
-	Dealer				string	`json:"dealer"`
-	DrugId				int64	`json:"drug_id"`
-	DrugName			string	`json:"drug_name"`
-	DrugType			int64	`json:"drug_type"`
-	DrugWarehouseInfo	interface{}	`json:"drug_warehouse_info"`
-	ExpiryDate			string	`json:"expiry_date"`
-	LastPrice			float64	`json:"last_price"`
-	Manufacturer		string	`json:"manufacturer"`
-	MaxUnit				string	`json:"max_unit"`
-	MinUnit				string	`json:"min_unit"`
-	Name 				string	`json:"name"`
-	Price 				string	`json:"price"`
-	ProductDate			string	`json:"product_date"`
-	RegisterAccount		string	`json:"register_account"`
-	Remark				string	`json:"remark"`
-	RetailPrice			string	`json:"retail_price"`
-	ReturnCount			string	`json:"return_count"`
-
+	BatchNumber       string      `json:"batch_number"`
+	BatchNumberId     int64       `json:"batch_number_id"`
+	Dealer            string      `json:"dealer"`
+	DrugId            int64       `json:"drug_id"`
+	DrugName          string      `json:"drug_name"`
+	DrugType          int64       `json:"drug_type"`
+	DrugWarehouseInfo interface{} `json:"drug_warehouse_info"`
+	ExpiryDate        string      `json:"expiry_date"`
+	LastPrice         float64     `json:"last_price"`
+	Manufacturer      string      `json:"manufacturer"`
+	MaxUnit           string      `json:"max_unit"`
+	MinUnit           string      `json:"min_unit"`
+	Name              string      `json:"name"`
+	Price             string      `json:"price"`
+	ProductDate       string      `json:"product_date"`
+	RegisterAccount   string      `json:"register_account"`
+	Remark            string      `json:"remark"`
+	RetailPrice       string      `json:"retail_price"`
+	ReturnCount       string      `json:"return_count"`
 }
+
 //药品发药药品列表
 type ListOfDrugs struct {
-	ID int64	`json:"id"`		//药品id
-	Name string	`json:"name"`	//药品 名称
-	Specifications string	`json:"specifications"` //规格
-	Stock string	`json:"stock"`  //库存（当前的仓库库存）
+	ID             int64  `json:"id"`             //药品id
+	Name           string `json:"name"`           //药品 名称
+	Specifications string `json:"specifications"` //规格
+	Stock          string `json:"stock"`          //库存（当前的仓库库存）
 }
+
 //病人信息
 type PatientInformation struct {
-	Id			string  `json:"id"`//hid表示his_doctor_advice_info的id ,xid表示xt_doctor_advice的id
-	Name 		string  `json:"name"`//患者姓名
-	SingleDosage string	`json:"single_dosage"` //单次用量
-	Usage string		`json:"usage"`//用法
-	Frequency string `json:"frequency"`//频率
-	Days string	`json:"days"`//天数
-	Total string `json:"total"`//总量
-	DataSources string	`json:"data_sources"`//数据来源
-	People	string	`json:"people"`//领药人
+	Id           string `json:"id"`            //hid表示his_doctor_advice_info的id ,xid表示xt_doctor_advice的id
+	PatientId    int64  `json:"patient_id"`    //患者id
+	Name         string `json:"name"`          //患者姓名
+	SingleDosage string `json:"single_dosage"` //单次用量
+	Usage        string `json:"usage"`         //用法
+	Frequency    string `json:"frequency"`     //频率
+	Days         string `json:"days"`          //天数
+	Total        string `json:"total"`         //总量
+	DataSources  string `json:"data_sources"`  //数据来源
+	People       string `json:"people"`        //领药人
+	Quantity     int64  `json:"quantity"`      //总量拆分——数据部分
+	Unit         string `json:"unit"`          //总量拆分——单位部分
 }
 type HisDoctorAdviceInfoL 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"`
-	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"`
-	AdviceType            int64                  `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
-	AdviceDate            int64                  `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
-	StartTime             int64                  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	AdviceName            string                 `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	AdviceDesc            string                 `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
-	ReminderDate          int64                  `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
-	SingleDose            float64                `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	SingleDoseUnit        string                 `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
-	PrescribingNumber     float64                `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	DeliveryWay           string                 `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string                 `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	AdviceDoctor          int64                  `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
-	Status                int64                  `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime           int64                  `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime           int64                  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	AdviceAffirm          string                 `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
-	Remark                string                 `gorm:"column:remark" json:"remark" form:"remark"`
-	StopTime              int64                  `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
-	StopReason            string                 `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
-	StopDoctor            int64                  `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
-	StopState             int64                  `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
-	ParentId              int64                  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
-	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"`
-	Checker               int64                  `gorm:"column:checker" json:"checker" form:"checker"`
-	RecordDate            int64                  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	DialysisOrderId       int64                  `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
-	CheckTime             int64                  `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState            int64                  `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	DrugSpec              float64                `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugSpecUnit          string                 `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
-	Groupno               int64                  `gorm:"column:groupno" json:"groupno" form:"groupno"`
-	RemindType            int64                  `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
-	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"`
-	TemplateId            string                 `gorm:"column:template_id" json:"template_id" form:"template_id"`
-	Modifier              int64                  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	DrugId                int64                  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Price                 float64                `gorm:"column:price" json:"price" form:"price"`
-	PrescriptionId        int64                  `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	MedListCodg           string                 `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	FeedetlSn             string                 `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	Day                   int64                  `gorm:"column:day" json:"day" form:"day"`
-	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	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"`
-	IsMedicine			  int64					 `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
-	People				  int64					 `gorm:"column:people" json:"people" form:"people"`
-	DispensingTime		  int64					 `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	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"`
+	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	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"`
+	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
+	Diagnosis             int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	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"`
+	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	People                int64   `gorm:"column:people" json:"people" form:"people"`
+	DispensingTime        int64   `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
 }
 
 func (HisDoctorAdviceInfoL) TableName() string {
@@ -231,24 +240,304 @@ type XtDoctorAdviceL struct {
 	UserName              string  `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	CheckerName           string  `gorm:"column:user_name" json:"name" form:"name"`
 	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	IsMedicine			  int64	  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
-	People				  int64	  `gorm:"column:people" json:"people" form:"people"`
-	DispensingTime		  int64	  `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
+	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	People                int64   `gorm:"column:people" json:"people" form:"people"`
+	DispensingTime        int64   `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
 }
 
 func (XtDoctorAdviceL) TableName() string {
 	return "sgj_xt.xt_doctor_advice"
 }
+
 type TmpTTT struct {
 	PatientID int64
 }
 type TmpLLL struct {
-	DrugId    int64
+	DrugId int64
 }
 type TmpID struct {
-	Id    int64
+	Id             int64
 	DispensingTime int64
 }
-type TmpAdviceDoctor  struct {
-	AdviceDoctor    int64
+type TmpAdviceDoctor struct {
+	AdviceDoctor int64
+}
+
+//替换药品名称
+type ReplacementDrugs struct {
+	Id   int64  `json:"id"`
+	Name string `json:"name"`
+}
+
+//病人
+type DialysisPatient struct {
+	ID   int64  `json:"id"`
+	Name string `json:"name"`
+}
+
+//项目下拉列表
+type DropDownList struct {
+	Id   string `json:"id"`
+	Name string `json:"name"`
+}
+type XtHisProjectL struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"` //统计分类（组
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	DefaultNumber               string  `gorm:"column:default_number" json:"prescribing_number" form:"default_number"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                  string  `gorm:"column:number_days" json:"day" form:"number_days"`
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Translate                   string  `json:"translate"` //翻译——统计分类（组
+}
+
+func (XtHisProjectL) TableName() string {
+	return "sgj_xt.xt_his_project"
+}
+
+type GoodInfoL struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodCode               string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName      string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId             int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit               int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice               float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice              float64 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                 string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount int64   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount         int64   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                int64   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	FilmArea               string  `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                  int64   `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality    string  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier               int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName               string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind               int64   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"` //组
+	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+
+	IsSpecialDiseases           int64                `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64                `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	StatisticsCategory          int64                `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus                  string               `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64                `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	Sign                        int64                `gorm:"column:sign" json:"sign" form:"sign"`
+	IsDefault                   int64                `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64                `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict             int64                `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64                `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sort                        int64                `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64                `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string               `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string               `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	GoodsType                   GoodsType            `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
+	CommdityCode                string               `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string               `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string               `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string               `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	IsMark                      int64                `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	MinNumber                   int64                `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingUnit                 string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DefaultCountUnit            string               `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
+	MinUnit                     string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Total                       float64              `gorm:"column:total" json:"total" form:"total"`
+	StWarehousingInfo           []*StWarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
+	CancelStockInfo             []*CancelStockInfo   `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"cancel_stock_info"`
+	RegisterNumber              string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	GoodSotckInfo               []*GoodSotckInfo     `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_stock_in"`
+	IsUser                      int64                `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	Number                      string               `gorm:"column:number" json:"number" form:"number"`
+	IsWarehouse                 int64                `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	SumCount                    int64                `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	BatchRetaiPrice             float64              `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumInCount                  int64                `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	WarehousingInfo             []*WarehousingInfo   `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"warehouse_info"`
+	Translate                   string               `json:"translate"` //翻译——统计分类（组
+}
+
+func (GoodInfoL) TableName() string {
+	return "sgj_xt.xt_good_information"
+}
+
+type BaseDrugLibL struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                        string  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                        string  `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit              string  `json:"single_dose_unit"` //danwei
+	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	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"`
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	PrescriptionMark            int64   `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	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"`
+	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	DrugDay               string                 `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                 float64                `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DrugWarehouseInfo     []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	IsUse                 int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	BatchRetaiPrice       float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumCount              int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SumInCount            int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	IsPharmacy            int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	List1                 interface{}            `json:"list_1"`
+	List2                 interface{}            `json:"list_2"`
+}
+
+func (BaseDrugLibL) TableName() string {
+	return "xt_base_drug"
+}
+
+//组
+type HisPrescriptionInfoTemplateL 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"`
+	Ctime                          int64                              `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                          int64                              `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Type                           int64                              `gorm:"column:type" json:"type" form:"type"`
+	Creator                        int64                              `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier                       int64                              `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	PType                          int64                              `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	PTemplateId                    int64                              `gorm:"column:p_template_id" json:"p_template_id" form:"p_template_id"`
+	HisPrescriptionAdviceTemplate  []*HisPrescriptionAdviceTemplate   `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProjectTemplate []*HisPrescriptionProjectTemplateL `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	MedType                        string                             `gorm:"column:med_type" json:"med_type" form:"med_type"`
+}
+
+func (HisPrescriptionInfoTemplateL) TableName() string {
+	return "his_prescription_info_template"
+}
+
+type HisPrescriptionProjectTemplateL 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"`
+	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"`
+	PrescriptionId     int64         `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	XtHisProject       XtHisProjectL `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	GoodInfo           GoodInfoL     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"good_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"`
+}
+
+func (HisPrescriptionProjectTemplateL) TableName() string {
+	return "his_prescription_project_template"
 }

service/auto_create_week_schedules_service.go

@@ -142,7 +142,7 @@ func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.
 
 	now := time.Now()
 	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&week)
-	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", orgID, monday.Unix(), sunday.Unix()).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", orgID, monday.Unix(), sunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
 	//fmt.Println("disableErr323232332323232233222332232332",disableErr)
 	if disableErr != nil {
 		return disableErr

service/data.go

@@ -317,8 +317,8 @@ func BatchInspectionConfiguration(orgid int64) (err error) {
 	return
 }
 
-func ShowFiledConfig(org_id int64, isShow int, id int64) (err error) {
-	err = readDb.Model(&models.FiledConfig{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"create_time": time.Now().Unix(), "update_time": time.Now().Unix(), "is_show": isShow}).Error
+func ShowFiledConfig(org_id int64, isShow int, is_write int, id int64) (err error) {
+	err = readDb.Model(&models.FiledConfig{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"create_time": time.Now().Unix(), "update_time": time.Now().Unix(), "is_show": isShow, "is_write": is_write}).Error
 	return
 }
 

service/dialysis_service.go

@@ -131,7 +131,7 @@ func GetTotalDialysisCout(orgid int64, patientid int64) (order []*models.Dialysi
 //临时医嘱
 func FindDoctorAdviceOrderById(orgID int64, patientsId int64, recordDate int64) (patient []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).
-		Where("patient_id = ? and user_org_id=? and status=1 and record_date = ? and advice_type = 2", patientsId, orgID, recordDate).
+		Where("patient_id = ? and user_org_id=? and status=1 and advice_date = ? and advice_type = 2", patientsId, orgID, recordDate).
 		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno, IF(parent_id > 0, parent_id, id) as advice_order").Order("start_time asc, groupno desc, advice_order desc, id asc").
 		Find(&patient).Error
 	return

service/his_config_service.go

@@ -1,7 +1,15 @@
 package service
 
 import (
+	"XT_New/enums"
 	"XT_New/models"
+	"XT_New/utils"
+	"fmt"
+	"github.com/astaxie/beego/config"
+	"golang.org/x/sync/errgroup"
+
+	"reflect"
+	"strconv"
 	"time"
 )
 
@@ -56,3 +64,817 @@ func DelelteHisPrescriptionProjectTemplate(id int64, user_org_id int64) (err err
 
 	return
 }
+
+//封装保存接口
+func FenCreatePrescriptionTemplate(id, mode_id, types, patient_id int64, name string, adminInfo *AdminUserInfo, dataBody map[string]interface{}) (err error) {
+	tmp_bool_id := IsDialysisMode(adminInfo.CurrentOrgId, patient_id, mode_id)
+
+	var src_template models.HisPrescriptionTemplate
+	if !tmp_bool_id {
+		template := models.HisPrescriptionTemplate{
+			UserOrgId: adminInfo.CurrentOrgId,
+			PatientId: patient_id,
+			Type:      types,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+			Name:      name,
+			Mode:      mode_id,
+		}
+		src_template = template
+		CreateHisPrescriptionTemplate(&src_template)
+	} else {
+		//查询出该模板的id
+		err = XTReadDB().Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? and patient_id = ? and status = 1 and mode = ?", adminInfo.CurrentOrgId, patient_id, mode_id).Find(&src_template).Error
+		if err != nil {
+			return
+		}
+		src_template.Name = name
+		src_template.Mode = mode_id
+		SaveHisPrescriptionTemplate(&src_template)
+	}
+
+	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["prescriptions"].([]interface{})
+		if len(prescriptions) > 0 {
+			for _, item := range prescriptions {
+				items := item.(map[string]interface{})
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					err = fmt.Errorf("参数错误")
+					return
+				}
+
+				id := int64(items["id"].(float64))
+
+				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+					utils.ErrorLog("type")
+					//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					err = fmt.Errorf("参数错误")
+					return
+				}
+				types := int64(items["type"].(float64))
+
+				if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+					utils.ErrorLog("med_type")
+					//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					err = fmt.Errorf("参数错误")
+					return
+				}
+				med_type := strconv.Itoa(int(items["med_type"].(float64)))
+
+				ctime := time.Now().Unix()
+				prescription := &models.HisPrescriptionInfoTemplate{
+					ID:          id,
+					PatientId:   patient_id,
+					UserOrgId:   adminInfo.CurrentOrgId,
+					Ctime:       ctime,
+					Mtime:       ctime,
+					Type:        types,
+					Modifier:    adminInfo.AdminUser.Id,
+					Creator:     adminInfo.AdminUser.Id,
+					Status:      1,
+					PTemplateId: src_template.ID,
+					MedType:     med_type,
+				}
+				CreateHisPrescriptionInfoTemplate(prescription)
+
+				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+					advices := items["advices"].([]interface{})
+					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+					groupNo := int64(0)
+					ctime := time.Now().Unix()
+					mtime := ctime
+					if len(advices) > 0 {
+						for _, advice := range advices {
+							var s models.HisPrescriptionAdviceTemplate
+							s.PrescriptionId = prescription.ID
+							s.AdviceType = 2
+							s.StopState = 2
+							s.ExecutionState = 2
+							s.Status = 1
+							s.UserOrgId = adminInfo.CurrentOrgId
+							s.Groupno = groupNo
+							s.CreatedTime = ctime
+							s.UpdatedTime = mtime
+							s.PatientId = patient_id
+							errcode := FensetAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
+							if errcode > 0 {
+								//c.ServeFailJSONWithSGJErrorCode(errcode)
+								err = fmt.Errorf("参数错误")
+								return
+							}
+							CreateHisPrescriptionAdviceTemplate(&s)
+						}
+					}
+				}
+				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+					projects := items["project"].([]interface{})
+					if len(projects) > 0 {
+						for _, project := range projects {
+							var p models.HisPrescriptionProjectTemplate
+							p.PrescriptionId = prescription.ID
+							p.Ctime = time.Now().Unix()
+							p.Mtime = time.Now().Unix()
+							p.PatientId = patient_id
+							p.UserOrgId = adminInfo.CurrentOrgId
+							p.Status = 1
+							errcode := FensetProjectTemplateWithJSON(&p, project.(map[string]interface{}))
+							if errcode > 0 {
+								//c.ServeFailJSONWithSGJErrorCode(errcode)
+								err = fmt.Errorf("参数错误")
+								return
+							}
+							CreateHisPrescriptionProjectTemplate(&p)
+
+						}
+					}
+				}
+			}
+			return nil
+		}
+	}
+	return
+}
+
+//复制一个setProjectTemplateWithJSON接口
+func FensetProjectTemplateWithJSON(project *models.HisPrescriptionProjectTemplate, json map[string]interface{}) int {
+	if json["id"] != nil {
+		id := json["id"].(string)
+		if id != "" {
+			tmpPid := id[1:]
+			project_id, _ := strconv.ParseInt(tmpPid, 10, 64)
+			if id[0] == 112 {
+				project.Type = 2
+			}
+			if id[0] == 105 {
+				project.Type = 3
+			}
+			project.ProjectId = project_id
+		} else {
+			project.ProjectId = int64(0)
+		}
+
+	}
+	if json["frequency_type"] != nil && reflect.TypeOf(json["frequency_type"]).String() == "string" {
+		tmp_drugid := json["frequency_type"].(string)
+		frequency_type, _ := strconv.ParseInt(tmp_drugid, 10, 64)
+		project.FrequencyType = frequency_type
+	}
+	if json["frequency_type"] != nil && reflect.TypeOf(json["frequency_type"]).String() == "float64" {
+		frequency_type := int64(json["frequency_type"].(float64))
+		project.FrequencyType = frequency_type
+	}
+
+	if json["day_count"] != nil && reflect.TypeOf(json["day_count"]).String() == "string" {
+		tmp_drugid := json["day_count"].(string)
+		day_count, _ := strconv.ParseInt(tmp_drugid, 10, 64)
+		project.DayCount = day_count
+	}
+	if json["day_count"] != nil && reflect.TypeOf(json["day_count"]).String() == "float64" {
+		day_count := int64(json["day_count"].(float64))
+		project.DayCount = day_count
+	}
+
+	if json["week_day"] != nil && reflect.TypeOf(json["week_day"]).String() == "string" {
+		week_day, _ := json["week_day"].(string)
+		project.WeekDay = week_day
+	}
+	if json["week_day"] != nil && reflect.TypeOf(json["week_day"]).String() == "float64" {
+		week_day := config.ToString(json["week_day"].(float64))
+		project.WeekDay = week_day
+	}
+
+	//if json["type"] != nil || reflect.TypeOf(json["type"]).String() == "float64" {
+	//	types := int64(json["type"].(float64))
+	//	project.Type = types
+	//}
+	//if json["project_id"] != nil || reflect.TypeOf(json["project_id"]).String() == "float64" {
+	//	project_id := int64(json["project_id"].(float64))
+	//	project.ProjectId = project_id
+	//}
+	if json["price"] != nil && reflect.TypeOf(json["price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["price"].(string), 64)
+		project.Price = price
+	}
+
+	if json["price"] != nil && reflect.TypeOf(json["price"]).String() == "float64" {
+		price := json["price"].(float64)
+		project.Price = price
+	}
+
+	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
+		total, _ := json["prescribing_number"].(string)
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
+	}
+	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "float64" {
+		total := config.ToString(json["prescribing_number"].(float64))
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
+	}
+
+	//if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
+	//	medical_code, _ := json["medical_code"].(string)
+	//	project.MedListCodg = medical_code
+	//}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		single_dose, _ := json["single_dose"].(string)
+		project.SingleDose = single_dose
+	}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "float64" {
+		single_dose := config.ToString(json["single_dose"].(float64))
+		project.SingleDose = single_dose
+	}
+
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		delivery_way, _ := json["delivery_way"].(string)
+		project.DeliveryWay = delivery_way
+	}
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		execution_frequency, _ := json["execution_frequency"].(string)
+		project.ExecutionFrequency = execution_frequency
+	}
+	if json["remark"] != nil && reflect.TypeOf(json["remark"]).String() == "string" {
+		remark, _ := json["remark"].(string)
+		project.Remark = remark
+	}
+	if json["day"] != nil && reflect.TypeOf(json["remark"]).String() == "string" {
+		day, _ := json["number_days"].(string)
+		project.Day = day
+	}
+	if json["day"] != nil && reflect.TypeOf(json["remark"]).String() == "float64" {
+		day := config.ToString(json["number_days"].(float64))
+		project.Day = day
+	}
+
+	if json["unit"] != nil && reflect.TypeOf(json["unit"]).String() == "string" {
+		unit, _ := json["unit"].(string)
+		project.Unit = unit
+	}
+	return 0
+}
+
+//复制一个setAdviceTemplateWithJSON接口
+func FensetAdviceTemplateWithJSON(advice *models.HisPrescriptionAdviceTemplate, json map[string]interface{}) int {
+	//if json["advice_id"] != nil || reflect.TypeOf(json["advice_id"]).String() == "float64" {
+	//	advice_id := int64(json["advice_id"].(float64))
+	//	advice.ID = advice_id
+	//}
+
+	if json["drug_name"] == nil {
+		utils.ErrorLog("drug_name")
+		return enums.ErrorCodeParamWrong
+	}
+	var tmpdrugid int64
+	if json["drug_name"] != nil && reflect.TypeOf(json["drug_name"]).String() == "string" {
+		tmpdrugid, _ = strconv.ParseInt(json["drug_name"].(string), 10, 64)
+	}
+	if json["drug_name"] != nil && reflect.TypeOf(json["drug_name"]).String() == "float64" {
+		tmpdrugid = int64(json["drug_name"].(float64))
+	}
+
+	advice.AdviceName = FindDrugsName(tmpdrugid)
+	//adviceDesc, _ := json["advice_desc"].(string)
+	//advice.AdviceDesc = adviceDesc
+	//if json["drug_spec"] != nil && reflect.TypeOf(json["drug_spec"]).String() == "string" {
+	//	drugSpec, _ := strconv.ParseFloat(json["drug_spec"].(string), 64)
+	//	advice.DrugSpec = drugSpec
+	//}
+
+	if json["remark"] != nil && reflect.TypeOf(json["remark"]).String() == "string" {
+		remark, _ := json["remark"].(string)
+		advice.Remark = remark
+	}
+
+	if json["id"] == nil {
+		advice.DrugId = 0
+	} else {
+		if json["id"] != nil && reflect.TypeOf(json["id"]).String() == "string" {
+			tmp_drugid := json["id"].(string)
+			drug_id, _ := strconv.ParseInt(tmp_drugid, 10, 64)
+			advice.DrugId = drug_id
+		}
+		if json["id"] != nil && reflect.TypeOf(json["id"]).String() == "float64" {
+			drug_id := int64(json["id"].(float64))
+			advice.DrugId = drug_id
+		}
+	}
+
+	//if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
+	//	drugSpecUnit, _ := json["min_unit"].(string)
+	//	advice.DrugSpecUnit = drugSpecUnit
+	//}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		singleDose, _ := strconv.ParseFloat(json["single_dose"].(string), 64)
+		advice.SingleDose = singleDose
+	}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "float64" {
+		singleDose := json["single_dose"].(float64)
+		advice.SingleDose = singleDose
+	}
+	if json["single_dose_unit"] != nil && reflect.TypeOf(json["single_dose_unit"]).String() == "string" {
+		singleDoseUnit, _ := json["single_dose_unit"].(string)
+		advice.SingleDoseUnit = singleDoseUnit
+	}
+	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
+		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
+		advice.PrescribingNumber = prescribingNumber
+	}
+	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "float64" {
+		prescribingNumber := json["prescribing_number"].(float64)
+		advice.PrescribingNumber = prescribingNumber
+	}
+	if json["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
+		prescribingNumberUnit, _ := json["prescribing_number_unit"].(string)
+		advice.PrescribingNumberUnit = prescribingNumberUnit
+	}
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		deliveryWay, _ := json["delivery_way"].(string)
+		advice.DeliveryWay = deliveryWay
+	}
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		executionFrequency, _ := json["execution_frequency"].(string)
+		advice.ExecutionFrequency = executionFrequency
+	}
+	fmt.Println("44444444444")
+	if json["price"] != nil && reflect.TypeOf(json["price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["price"].(string), 64)
+		advice.Price = price
+	}
+	if json["price"] != nil && reflect.TypeOf(json["price"]).String() == "float64" {
+		price := json["price"].(float64)
+		advice.Price = price
+	}
+	//if json["medical_insurance_number"] != nil || reflect.TypeOf(json["medical_insurance_number"]).String() == "string" {
+	//	med_list_codg, _ := json["medical_insurance_number"].(string)
+	//	advice.MedListCodg = med_list_codg
+	//}
+	//fmt.Println("333333333")
+	if json["day"] != nil && reflect.TypeOf(json["day"]).String() == "string" {
+		day, _ := strconv.ParseInt(json["day"].(string), 10, 64)
+		advice.Day = day
+	}
+	if json["day"] != nil && reflect.TypeOf(json["day"]).String() == "float64" {
+		day := int64(json["day"].(float64))
+		advice.Day = day
+	}
+	//if json["groupno"] != nil || reflect.TypeOf(json["groupno"]).String() == "float64" {
+	//	groupno := int64(json["groupno"].(float64))
+	//	advice.Groupno = groupno
+	//}
+
+	//if json["frequency_type"] != nil || reflect.TypeOf(json["frequency_type"]).String() == "float64" {//原型图没画不考虑
+	//	frequency_type := int64(json["frequency_type"].(float64))
+	//	advice.FrequencyType = frequency_type
+	//}
+	//
+	//if json["day_count"] != nil || reflect.TypeOf(json["day_count"]).String() == "float64" {
+	//	day_count := int64(json["day_count"].(float64))
+	//	advice.DayCount = day_count
+	//}
+	//
+	//if json["week_day"] != nil || reflect.TypeOf(json["week_day"]).String() == "string" {
+	//	week_day, _ := json["week_day"].(string)
+	//	advice.WeekDay = week_day
+	//}
+	//fmt.Println("aaaaaaaaaaaaaaaaaaaaaaaaa")
+	return 0
+}
+
+//判断该患者是否有该透析模式
+func IsDialysisMode(orgid, patient_id, mode int64) bool {
+	var total int
+	XTReadDB().Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? and patient_id = ? and status = 1 and mode = ?", orgid, patient_id, mode).Count(&total)
+	if total > 0 {
+		return true
+	} else {
+		return false
+	}
+}
+
+//获取该透析模式的患者列表
+func GetDialysisModePatient(orgid, model int64) (list []*models.DialysisPatient, err error) {
+	var tmp []*models.DialysisPatient
+	err = XTReadDB().Raw("select id,name from xt_patients,(SELECT patient_id FROM his_prescription_template WHERE user_org_id = ? and "+
+		"mode = ? and status = 1)a where id = a.patient_id", orgid, model).Scan(&tmp).Error
+	if err != nil {
+		return
+	}
+	return tmp, err
+}
+
+//如果没有名字默认透析模式
+func DialysisModeName(mode int64) string {
+	tmp := make(map[int64]string)
+	tmp[1] = "HD"
+	tmp[2] = "HDF"
+	tmp[3] = "HD+HP"
+	tmp[4] = "HP"
+	tmp[5] = "HF"
+	tmp[6] = "SCUF"
+	tmp[7] = "IUF"
+	tmp[8] = "HFHD"
+	tmp[9] = "HFHD+HP"
+	tmp[10] = "PHF"
+	tmp[11] = "HFR"
+	tmp[12] = "HDF+HP"
+	tmp[13] = "CRRT"
+	tmp[14] = "腹水回输"
+	//tmp[15] = "HD前置换"
+	//tmp[16] = "HD后置换"
+	//tmp[17] = "HDF前置换"
+	//tmp[18] = "HDF后置换"
+	tmp[19] = "IUF+HD"
+	tmp[20] = "UF"
+	tmp[21] = "HD+"
+	tmp[22] = "血浆胆红素吸附+HDF"
+	tmp[23] = "血浆胆红素吸附"
+	tmp[24] = "I-HDF"
+	tmp[25] = "HD高通"
+	tmp[26] = "CVVH"
+	tmp[27] = "CVVHD"
+	tmp[28] = "CVVHDF"
+	tmp[29] = "PE"
+	tmp[30] = "血浆胆红素吸附+HP"
+	tmp[31] = "HPD"
+	tmp[32] = "HDP"
+	if v, ok := tmp[mode]; ok {
+		return v
+	}
+	return ""
+}
+
+//查询出该模板的id
+func IdOfTheTemplate(orgid, patient_id, mode_id int64) (src_template models.HisPrescriptionTemplate, err error) {
+	err = XTReadDB().Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? and "+
+		"patient_id = ? and status = 1 and mode = ?", orgid, patient_id, mode_id).Find(&src_template).Error
+	return src_template, err
+}
+
+//根据透析模式、患者姓名、药品项目获取处方内容
+func GetPrescriptionContent(mode, orgid, patient_id int64) (list []*models.HisPrescriptionInfoTemplate, err error) {
+	var tmp models.HisPrescriptionTemplate
+	err = XTReadDB().Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? and patient_id = ? and mode = ? and status = 1", orgid, patient_id, mode).Find(&tmp).Error
+	if err != nil {
+		return
+	}
+	var prescriptions []*models.HisPrescriptionInfoTemplate
+	prescriptions, err = GetHisPrescriptionTemplate(tmp.ID, orgid)
+	return prescriptions, err
+
+}
+
+//获取该透析模式患者列表（批量删除时用）药品
+func GetDialysisDrugDelect(orgid, model, drug_id int64) (list []*models.DialysisPatient, err error) {
+	var tmp []*models.DialysisPatient
+	err = XTReadDB().Raw("select id,name from xt_patients,("+
+		"select distinct patient_id from his_prescription_advice_template,("+
+		"select his_prescription_info_template.id from his_prescription_info_template,("+
+		"SELECT id FROM his_prescription_template WHERE user_org_id = ? and mode = ? and status = 1"+
+		")his where status = 1 and his_prescription_info_template.p_template_id = his.id"+
+		")hisa where status = 1 and prescription_id = hisa.id and drug_id = ?)a where id = a.patient_id", orgid, model, drug_id).Scan(&tmp).Error
+	if err != nil {
+		return
+	}
+	return tmp, err
+}
+
+//获取该透析模式患者列表（批量删除时用）项目
+func GetDialysisProjectDelect2(orgid, model, drug_id int64) (list []*models.DialysisPatient, err error) {
+	var tmp []*models.DialysisPatient
+	err = XTReadDB().Raw("select id,name from xt_patients,("+
+		"select distinct patient_id from his_prescription_project_template,("+
+		"select his_prescription_info_template.id from his_prescription_info_template,("+
+		"SELECT id FROM his_prescription_template WHERE user_org_id = ? and mode = ? and status = 1"+
+		")his where status = 1 and his_prescription_info_template.p_template_id = his.id"+
+		")hisb where status = 1 and prescription_id = hisb.id and project_id = ? and type = 2)a where id = a.patient_id", orgid, model, drug_id).Scan(&tmp).Error
+	if err != nil {
+		return
+	}
+	return tmp, err
+}
+
+//获取该透析模式患者列表（批量删除时用）耗材
+func GetDialysisProjectDelect3(orgid, model, drug_id int64) (list []*models.DialysisPatient, err error) {
+	var tmp []*models.DialysisPatient
+	err = XTReadDB().Raw("select id,name from xt_patients,("+
+		"select distinct patient_id from his_prescription_project_template,("+
+		"select his_prescription_info_template.id from his_prescription_info_template,("+
+		"SELECT id FROM his_prescription_template WHERE user_org_id = ? and mode = ? and status = 1"+
+		")his where status = 1 and his_prescription_info_template.p_template_id = his.id"+
+		")hisb where status = 1 and prescription_id = hisb.id and project_id = ? and type = 3)a where id = a.patient_id", orgid, model, drug_id).Scan(&tmp).Error
+	if err != nil {
+		return
+	}
+	return tmp, err
+}
+
+//根据透析模式删除药品
+func ModeDeleteDrug(orgid, model, drug_id int64, patient_id []int64) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	var g errgroup.Group
+	var tmp []*models.DialysisPatient
+	err = tx.Raw("select his_prescription_advice_template.id from his_prescription_advice_template,("+
+		"select his_prescription_info_template.id from his_prescription_info_template,("+
+		"SELECT id FROM his_prescription_template WHERE user_org_id = ? and mode = ? and status = 1"+
+		")his where status = 1 and his_prescription_info_template.p_template_id = his.id"+
+		")hisa where status = 1 and prescription_id = hisa.id and drug_id = ? and patient_id in (?)", orgid, model, drug_id, patient_id).Scan(&tmp).Error
+	for _, v := range tmp {
+		g.Go(func() error {
+			tmp := v
+			var err error
+			err = tx.Model(&models.HisPrescriptionAdviceTemplate{}).Where("id = ?", tmp.ID).Updates(map[string]interface{}{
+				"status":       0,
+				"updated_time": time.Now().Unix(),
+			}).Error
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		return
+	}
+	return
+}
+
+//根据透析模式删除项目和耗材
+func ModeDelectItemsAndConsumables(orgid, model int64, drug_id string, patient_id []int64) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	front := drug_id[:1]
+	after := drug_id[1:]
+	project_id, _ := strconv.ParseInt(after, 10, 64)
+	var g errgroup.Group
+	var tmp []*models.DialysisPatient
+	if front == "p" {
+		err = tx.Raw("select his_prescription_project_template.id from his_prescription_project_template,("+
+			"select his_prescription_info_template.id from his_prescription_info_template,("+
+			"SELECT id FROM his_prescription_template WHERE user_org_id = ? and mode = ? and status = 1"+
+			")his where status = 1 and his_prescription_info_template.p_template_id = his.id"+
+			")hisb where status = 1 and prescription_id = hisb.id and project_id = ? and type = 2 and patient_id in (?)", orgid, model, project_id, patient_id).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	}
+	if front == "i" {
+		err = tx.Raw("select his_prescription_project_template.id from his_prescription_project_template,("+
+			"select his_prescription_info_template.id from his_prescription_info_template,("+
+			"SELECT id FROM his_prescription_template WHERE user_org_id = ? and mode = ? and status = 1"+
+			")his where status = 1 and his_prescription_info_template.p_template_id = his.id"+
+			")hisb where status = 1 and prescription_id = hisb.id and project_id = ? and type = 3 and patient_id in (?)", orgid, model, project_id, patient_id).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	}
+	for _, v := range tmp {
+		g.Go(func() error {
+			tmp := v
+			var err error
+			err = tx.Model(&models.HisPrescriptionProjectTemplate{}).Where("id = ?", tmp.ID).Updates(map[string]interface{}{
+				"status": 0,
+				"mtime":  time.Now().Unix(),
+			}).Error
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		return
+	}
+	return
+}
+
+//替换该透析模式药品
+func ReplaceDrug(orgid, model, drug_id int64, patient_id []int64, advice models.HisPrescriptionAdviceTemplate) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	var g errgroup.Group
+	var tmp []*models.DialysisPatient
+	err = tx.Raw("select his_prescription_advice_template.id from his_prescription_advice_template,("+
+		"select his_prescription_info_template.id from his_prescription_info_template,("+
+		"SELECT id FROM his_prescription_template WHERE user_org_id = ? and mode = ? and status = 1"+
+		")his where status = 1 and his_prescription_info_template.p_template_id = his.id"+
+		")hisa where status = 1 and prescription_id = hisa.id and drug_id = ? and patient_id in (?)", orgid, model, drug_id, patient_id).Scan(&tmp).Error
+	for _, v := range tmp {
+		g.Go(func() error {
+			tmp := v
+			var err error
+			err = tx.Model(&models.HisPrescriptionAdviceTemplate{}).Where("id = ?", tmp.ID).Updates(map[string]interface{}{
+				"drug_id":                 advice.DrugId,
+				"single_dose":             advice.SingleDose,
+				"single_dose_unit":        advice.SingleDoseUnit,
+				"delivery_way":            advice.DeliveryWay,
+				"execution_frequency":     advice.ExecutionFrequency,
+				"day":                     advice.Day,
+				"prescribing_number":      advice.PrescribingNumber,
+				"prescribing_number_unit": advice.PrescribingNumberUnit,
+				"price":                   advice.Price,
+				"remark":                  advice.Remark,
+				"updated_time":            time.Now().Unix(),
+			}).Error
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		return
+	}
+	return
+}
+
+//替换该透析模式耗材
+func ReplaceItemsAndConsumables(orgid, model int64, drug_id string, patient_id []int64, project models.HisPrescriptionProjectTemplate) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	front := drug_id[:1]
+	after := drug_id[1:]
+	project_id, _ := strconv.ParseInt(after, 10, 64)
+	var g errgroup.Group
+	var tmp []*models.DialysisPatient
+	if front == "p" {
+		project.Type = 2
+		err = tx.Raw("select his_prescription_project_template.id from his_prescription_project_template,("+
+			"select his_prescription_info_template.id from his_prescription_info_template,("+
+			"SELECT id FROM his_prescription_template WHERE user_org_id = ? and mode = ? and status = 1"+
+			")his where status = 1 and his_prescription_info_template.p_template_id = his.id"+
+			")hisb where status = 1 and prescription_id = hisb.id and project_id = ? and type = 2 and patient_id in (?)", orgid, model, project_id, patient_id).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	}
+	if front == "i" {
+		project.Type = 3
+		err = tx.Raw("select his_prescription_project_template.id from his_prescription_project_template,("+
+			"select his_prescription_info_template.id from his_prescription_info_template,("+
+			"SELECT id FROM his_prescription_template WHERE user_org_id = ? and mode = ? and status = 1"+
+			")his where status = 1 and his_prescription_info_template.p_template_id = his.id"+
+			")hisb where status = 1 and prescription_id = hisb.id and project_id = ? and type = 3 and patient_id in (?)", orgid, model, project_id, patient_id).Scan(&tmp).Error
+		if err != nil {
+			return
+		}
+	}
+	for _, v := range tmp {
+		g.Go(func() error {
+			tmp := v
+			var err error
+			err = tx.Model(&models.HisPrescriptionProjectTemplate{}).Where("id = ?", tmp.ID).Updates(map[string]interface{}{
+				"single_dose":         project.SingleDose,
+				"delivery_way":        project.DeliveryWay,
+				"execution_frequency": project.ExecutionFrequency,
+				"day":                 project.Day,
+				"count":               project.Count,
+				"price":               project.Price,
+				"remark":              project.Remark,
+				"type":                project.Type,
+				"mtime":               time.Now().Unix(),
+			}).Error
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		return
+	}
+	return
+}
+
+//跟据id查询药品、项目、耗材、套餐
+func QueryFourTables(id string, orgid int64) (tmp interface{}, err error) {
+	if id[0] == 112 {
+		after := id[1:]
+		var project []*models.XtHisProjectL
+		err = XTReadDB().Model(&project).Where("id = ?", after).Find(&project).Error
+		if err != nil {
+			return nil, err
+		} else {
+			for i := 0; i < len(project); i++ {
+				project[i].Translate, err = TranslateZu(project[i].StatisticalClassification, orgid, "统计分类")
+				if err != nil {
+					return nil, err
+				}
+			}
+			return project, err
+		}
+
+	} else if id[0] == 105 {
+		after := id[1:]
+		var good []*models.GoodInfoL
+		err = XTReadDB().Model(&models.GoodInfoL{}).Where("id = ?", after).Find(&good).Error
+		if err != nil {
+			return nil, err
+		} else {
+			for i := 0; i < len(good); i++ {
+				good[i].Translate = "耗材"
+			}
+			return good, err
+		}
+
+	} else if id[0] == 104 {
+		after := id[1:]
+		var team []*models.XtHisProjectTeam
+		err = XTReadDB().Model(&models.XtHisProjectTeam{}).Where("id = ?", after).Find(&team).Error
+		if err != nil {
+			return nil, err
+		} else {
+			return team, err
+		}
+
+	} else {
+		var lib []*models.BaseDrugLibL
+		err = XTReadDB().Model(&models.BaseDrugLibL{}).Where("id = ?", id).Find(&lib).Error
+		if err != nil {
+			return nil, err
+		} else {
+			for i := 0; i < len(lib); i++ {
+				lib[i].SingleDoseUnit = TypeConversion02(config.ToString(lib[i].DrugDoseUnit))
+				if err != nil {
+					return nil, err
+				}
+				type m struct {
+					Name string `json:"name"`
+				}
+				newM := []m{
+					{
+						lib[i].DoseUnit, //计量单位
+					},
+					{
+						lib[i].MinUnit, //拆零单位
+					},
+				}
+				newN := []m{
+					{
+						lib[i].MinUnit,
+					},
+					{
+						lib[i].MaxUnit,
+					},
+				}
+				lib[i].List1 = newM
+				lib[i].List2 = newN
+			}
+			return lib, err
+		}
+	}
+}
+
+//获取机构项目中所用的组
+func GetDataConfig(orgid int64) (dataconfig []*models.DictDataconfig, err error) {
+	err = XTReadDB().Raw("select * from xt_drug_data_config where parent_id in "+
+		"(select id from xt_drug_data_config where name = \"统计分类\" and parent_id = 0) "+
+		"and status =1 and (org_id = ? or org_id = 0)", orgid).Scan(&dataconfig).Error
+	return
+}
+
+//翻译项目中的组
+func TranslateZu(sc, orgid int64, types string) (s string, err error) {
+	var dataconfig []*models.DictDataconfig
+	tmp := "select * from xt_drug_data_config where parent_id in (select id from xt_drug_data_config where name = \"" + types + "\" and parent_id = 0) and value = " + config.ToString(sc) + " and status = 1 and (org_id = " + config.ToString(orgid) + " or org_id = 0)"
+
+	err = XTReadDB().Raw(tmp).Scan(&dataconfig).Error
+	if err != nil {
+		return
+	}
+	if len(dataconfig) > 1 {
+		err = fmt.Errorf("sql数据异常：%v", tmp)
+	}
+	if len(dataconfig) == 0 {
+		return "", err
+	}
+	return dataconfig[0].Name, err
+}

service/his_service.go

@@ -2211,6 +2211,20 @@ func GetHisPrescriptionTemplate(template_id int64, org_id int64) (prescription [
 	return
 }
 
+//组
+func GetHisPrescriptionTemplateL(template_id int64, org_id int64) (prescription []*models.HisPrescriptionInfoTemplateL, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfoTemplateL{}).
+		Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProjectTemplate", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisProject").Preload("GoodInfo", "status=1")
+		}).
+		Where("status = 1 AND p_template_id = ? ", template_id).
+		Find(&prescription).Error
+	return
+}
+
 func FindHisConsumablesByID(orgID int64, patient_id int64, recordDate int64, good_id int64) (consumables models.DialysisBeforePrepare, err error) {
 	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1 AND good_id = ?", orgID, patient_id, recordDate, good_id).First(&consumables).Error
 	return

service/mobile_dialysis_service.go

@@ -627,6 +627,14 @@ func MobileGetPredialysisEvaluationOne(orgID int64, patientID int64, recordDate
 	return &record, nil
 }
 
+func MobileGetPredialysisEvaluationTwo(orgID int64, patientID int64, recordDate int64) (models.PredialysisEvaluation, error) {
+
+	var record models.PredialysisEvaluation
+	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
+
+	return record, err
+}
+
 // 透前评估
 func MobileGetPredialysisEvaluation(orgID int64, patientID int64, recordDate int64) (*models.PredialysisEvaluation, error) {
 
@@ -635,6 +643,7 @@ func MobileGetPredialysisEvaluation(orgID int64, patientID int64, recordDate int
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":assessment_before_dislysis"
 	assessment_before_dislysis_str, _ := redis.Get(key).Result()
+	redis.Set(key, "", time.Second)
 	if len(assessment_before_dislysis_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {
@@ -756,6 +765,7 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 	doctor_advices_str, _ := redis.Get(key).Result()
 
 	if len(doctor_advices_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+
 		err := readDb.Model(&models.DoctorAdvice{}).
 			Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and (advice_type = 2 || advice_type = 3)", patientID, orgID, recordDate).
 			Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno,way,drug_id,is_medicine,drug_name_id, IF(parent_id > 0, parent_id, id) as advice_order").
@@ -902,6 +912,7 @@ func MobileGetMonitorRecords(orgID int64, patientID int64, recordDate int64) ([]
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":monitor_records"
+	redis.Set(key, "", time.Second)
 	monitor_records_str, _ := redis.Get(key).Result()
 
 	if len(monitor_records_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -2950,6 +2961,14 @@ func GetLastDialysisPrescriptionByPatientId(orgid int64, patientid int64, record
 	return &prescription, nil
 }
 
+func GetLastDialysisPrescriptionByPatientIdTwo(orgid int64, patientid int64, recorddate int64) (models.DialysisPrescription, error) {
+
+	prescription := models.DialysisPrescription{}
+	err := readDb.Model(&models.DialysisPrescription{}).Where("user_org_id = ? and patient_id = ? and record_date = ? and status = 1", orgid, patientid, recorddate).Find(&prescription).Error
+
+	return prescription, err
+}
+
 type HisMScheduleDoctorAdviceVM struct {
 	ID                     int64                            `gorm:"column:id" json:"id"`
 	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`

service/patient_service.go

@@ -74,7 +74,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 //GetAllPatientList 返回全部患者的列表
 func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, err error) {
 
-	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1 and p.lapseto = 1", orgID)
+	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1", orgID)
 
 	err = db.Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").Count(&total).Find(&patients).Error
 	return
@@ -572,7 +572,7 @@ func FindPatientWithDeviceByNo(orgID int64, no string, time int64) (patient mode
 		return db.Preload("DeviceNumber", "org_id = ?", orgID).
 			Preload("DeviceZone", "org_id = ?", orgID).
 			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
-	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status=1 and lapseto =1", orgID, no).First(&patient).Error
+	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status = 1", orgID, no).First(&patient).Error
 	return
 }
 

service/pharmacy_service.go

@@ -8,9 +8,11 @@ import (
 	"github.com/astaxie/beego/config"
 	"github.com/astaxie/beego/context"
 	"github.com/jinzhu/gorm"
+	"golang.org/x/sync/errgroup"
 	"math"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -527,6 +529,7 @@ func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*
 		pp = append(pp, &models.PatientInformation{
 			Id:           "h" + config.ToString(v.ID),
 			Name:         FindUserName(v.PatientId),
+			PatientId:    v.PatientId,
 			SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
 			Usage:        v.DeliveryWay,
 			Frequency:    v.ExecutionFrequency,
@@ -534,6 +537,8 @@ func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*
 			Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
 			DataSources:  "his处方",
 			People:       GetUserAdminName(v.People, orgid), //领药人！！！！！！！！！！！！！！！！！！！！！！
+			Quantity:     int64(v.PrescribingNumber),
+			Unit:         v.PrescribingNumberUnit,
 		})
 	}
 
@@ -554,6 +559,8 @@ func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*
 			Total:        config.ToString(v.PrescribingNumber) + v.PrescribingNumberUnit,
 			DataSources:  "临时医嘱",
 			People:       GetUserAdminName(v.People, orgid), //领药人
+			Quantity:     int64(v.PrescribingNumber),
+			Unit:         v.PrescribingNumberUnit,
 		})
 	}
 	return
@@ -980,7 +987,7 @@ func GetUserAdminName(id, orgID int64) string {
 	return tmp.UserName
 }
 
-//根据id查询是否已发药,true已发药，false未发药
+//根据id查询是否已发药,true已发药，false未发药gai
 func GiveTheMedicine(id int64) bool {
 	var xue models.PharmacyDoctorAdvice
 	XTReadDB().Model(&models.PharmacyDoctorAdvice{}).Where("id = ?", id).Find(&xue)
@@ -1302,3 +1309,584 @@ func ChangeHisPrescriptionid(id string) (err error) {
 	}
 	return
 }
+
+//获取药品规格
+func ReplacementDrugs(orgid int64, special bool) (list []*models.ReplacementDrugs, err error) {
+	var g errgroup.Group
+	var lib []*models.BaseDrugLib
+	var lock sync.Mutex
+	if special {
+		err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? and drug_status not like '%停用%' AND status = 1 and is_special_diseases = 1", orgid).Find(&lib).Error
+	} else {
+		err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? and drug_status not like '%停用%'  AND status = 1 ", orgid).Find(&lib).Error
+	}
+	if err != nil {
+		return
+	}
+	for _, v := range lib {
+		v := v
+		g.Go(func() error {
+			var tmp models.Manufacturer
+			err := readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
+			if err != nil {
+				return err
+			}
+			lock.Lock()
+			list = append(list, &models.ReplacementDrugs{
+				Id:   v.ID,
+				Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.MaxUnit + " " + tmp.ManufacturerName,
+			})
+			lock.Unlock()
+			return err
+		})
+	}
+	if errs := g.Wait(); errs != nil {
+		err = errs
+		return
+	}
+	return
+}
+
+//获取药品规格，不考虑特殊病
+func ReplacementDrugsT(orgid int64) (list []*models.ReplacementDrugs, err error) {
+	var lib []*models.BaseDrugLib
+	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ?  AND status = 1 and drug_status not like '%停用%' ", orgid).Find(&lib).Error
+	if err != nil {
+		return
+	}
+	for _, v := range lib {
+		var tmp models.Manufacturer
+		err = readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
+		if err != nil {
+			return
+		}
+
+		list = append(list, &models.ReplacementDrugs{
+			Id:   v.ID,
+			Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.PrescribingNumberUnit + " " + tmp.ManufacturerName,
+		})
+	}
+	return
+}
+
+//根据药品id获取药品名字
+func IdToDrugName(id int64) (name string) {
+	var lib models.BaseDrugLib
+	readDb.Model(&models.BaseDrugLib{}).Where("id = ?", id).Find(&lib)
+	return lib.DrugName
+}
+
+//获取项目和耗材和套餐
+func ProjectConsumables3(orgid int64) (list []*models.DropDownList, err error) {
+
+	var project []*models.XtHisProject
+	project, err = GetHisProject(orgid)
+	if err != nil {
+		return
+	}
+	for _, v := range project {
+		list = append(list, &models.DropDownList{
+			Id:   "p" + config.ToString(v.ID),
+			Name: v.ProjectName,
+		})
+	}
+
+	var good []*models.GoodInfo
+	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? and status = 1", orgid).Find(&good).Error
+	if err != nil {
+		return
+	}
+	for _, v := range good {
+		list = append(list, &models.DropDownList{
+			Id:   "i" + config.ToString(v.ID),
+			Name: v.GoodName,
+		})
+	}
+
+	var team []*models.XtHisProjectTeam
+	team, err = GetAllProjectTeam(orgid)
+	if err != nil {
+		return
+	}
+	for _, v := range team {
+		list = append(list, &models.DropDownList{
+			Id:   "h" + config.ToString(v.ID),
+			Name: v.ProjectTeam,
+		})
+	}
+
+	return
+}
+
+//获取项目和耗材
+func ProjectConsumables2(orgid int64, special bool) (list []*models.DropDownList, err error) {
+
+	var project []*models.XtHisProject
+	if special {
+		err = XTReadDB().Model(&project).Where("user_org_id = ? and medical_status != 1 and status = 1 and disease_directory = 1", orgid).Find(&project).Error
+	} else {
+		err = XTReadDB().Model(&project).Where("user_org_id = ? and medical_status != 1 and status = 1", orgid).Find(&project).Error
+	}
+	if err != nil {
+		return
+	}
+	for _, v := range project {
+		list = append(list, &models.DropDownList{
+			Id:   "p" + config.ToString(v.ID),
+			Name: v.ProjectName,
+		})
+	}
+
+	var good []*models.GoodInfo
+	if special {
+		err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? and good_status not like '%停用%' and status = 1 and is_special_diseases = 1", orgid).Find(&good).Error
+	} else {
+		err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? and good_status not like '%停用%' and status = 1", orgid).Find(&good).Error
+	}
+	if err != nil {
+		return
+	}
+	for _, v := range good {
+		list = append(list, &models.DropDownList{
+			Id:   "i" + config.ToString(v.ID),
+			Name: v.GoodName + " " + v.SpecificationName,
+		})
+	}
+
+	return
+}
+
+//获取项目和耗材不考虑特殊病
+func ProjectConsumables2T(orgid int64) (list []*models.DropDownList, err error) {
+
+	var project []*models.XtHisProject
+	err = XTReadDB().Model(&project).Where("user_org_id = ? and status = 1 and medical_status != 1", orgid).Find(&project).Error
+	if err != nil {
+		return
+	}
+	for _, v := range project {
+		list = append(list, &models.DropDownList{
+			Id:   "p" + config.ToString(v.ID),
+			Name: v.ProjectName,
+		})
+	}
+
+	var good []*models.GoodInfo
+	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? and status = 1 and good_status != 1", orgid).Find(&good).Error
+	if err != nil {
+		return
+	}
+	for _, v := range good {
+		list = append(list, &models.DropDownList{
+			Id:   "i" + config.ToString(v.ID),
+			Name: v.GoodName + " " + v.SpecificationName,
+		})
+	}
+
+	return
+}
+
+//查询药品
+func FindPatientDrug(orgid, patient_id, drugid, mode int64) bool {
+	var total int
+	XTReadDB().Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and status = 1 and "+
+		"prescription_id in (select id from his_prescription_info_template where status = 1 and user_org_id = ? and type = 1 and p_template_id in ("+
+		"select id from his_prescription_template where status= 1 and user_org_id = ? and mode = ?))", orgid, patient_id, drugid, orgid, orgid, mode).Count(&total)
+	if total > 0 {
+		return true
+	}
+	return false
+}
+
+//查询项目
+func FindPatientXiang(orgid, patient_id, drugid, mode int64) bool {
+	var total int
+	XTReadDB().Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and status = 1 and type = 2 and "+
+		"prescription_id in (select id from his_prescription_info_template where status = 1 and user_org_id = ? and type = 2 and p_template_id in ("+
+		"select id from his_prescription_template where status= 1 and user_org_id = ? and mode = ?))", orgid, patient_id, drugid, orgid, orgid, mode).Count(&total)
+	if total > 0 {
+		return true
+	}
+	return false
+}
+
+//查询耗材
+func FindPatientXiang2(orgid, patient_id, drugid, mode int64) bool {
+	var total int
+	XTReadDB().Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and status = 1 and type = 3 and "+
+		"prescription_id in (select id from his_prescription_info_template where status = 1 and user_org_id = ? and type = 2 and p_template_id in ("+
+		"select id from his_prescription_template where status= 1 and user_org_id = ? and mode = ?))", orgid, patient_id, drugid, orgid, orgid, mode).Count(&total)
+	if total > 0 {
+		return true
+	}
+	return false
+}
+
+//types处方类型，1.药品 2.项目,model透析模式
+func GetHisInfoTempalteId(model, orgid, types int64) (tp []int64) {
+	type tmpid struct {
+		Id int64
+	}
+	var tmp []*tmpid
+	XTReadDB().Raw("select id from his_prescription_info_template where status = 1 and user_org_id = ? and type = ? and p_template_id in ("+
+		"select id from his_prescription_template where status = 1 and user_org_id = ? and mode = ?)", orgid, types, orgid, model).Scan(&tmp)
+	for _, v := range tmp {
+		tp = append(tp, v.Id)
+	}
+	return
+}
+
+//替换药品处方模板
+func ReplaceDrugPrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, s models.HisPrescriptionAdviceTemplate, tx *gorm.DB) (err error) {
+	err = tx.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and "+
+		"status = 1 and prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
+		"drug_id":                 s.DrugId,
+		"advice_name":             s.AdviceName,
+		"single_dose":             s.SingleDose,
+		"single_dose_unit":        s.SingleDoseUnit,
+		"delivery_way":            s.DeliveryWay,
+		"execution_frequency":     s.ExecutionFrequency,
+		"day":                     s.Day,
+		"prescribing_number":      s.PrescribingNumber,
+		"prescribing_number_unit": s.PrescribingNumberUnit,
+		"price":                   s.Price,
+		"remark":                  s.Remark,
+		"updated_time":            time.Now().Unix(),
+	}).Error
+	return err
+}
+
+//替换项目模板
+func ReplaceProjectPrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, s models.HisPrescriptionProjectTemplate, tx *gorm.DB) (err error) {
+	err = tx.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and "+
+		"status = 1 and prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
+		"project_id":          s.ProjectId,
+		"type":                s.Type,
+		"frequency_type":      s.FrequencyType,
+		"day_count":           s.DayCount,
+		"week_day":            s.WeekDay,
+		"price":               s.Price,
+		"count":               s.Count,
+		"single_dose":         s.SingleDose,
+		"delivery_way":        s.DeliveryWay,
+		"execution_frequency": s.ExecutionFrequency,
+		"remark":              s.Remark,
+		"day":                 s.Day,
+		"unit":                s.Unit,
+		"mtime":               time.Now().Unix(),
+	}).Error
+	return err
+}
+
+//删除项目模板
+func DeleteProjectTemplate(orgid, patient_id, drugid int64, ids []int64, tx *gorm.DB) (err error) {
+	err = tx.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and patient_id = ? and project_id = ? and "+
+		"prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
+		"status": 0,
+		"mtime":  time.Now().Unix(),
+	}).Error
+	return err
+}
+
+//删除处方模板
+func DeletePrescriptionTemplate(orgid, patient_id, drugid int64, ids []int64, tx *gorm.DB) (err error) {
+	err = tx.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and patient_id = ? and drug_id = ? and "+
+		"prescription_id in (?)", orgid, patient_id, drugid, ids).Updates(map[string]interface{}{
+		"status":       0,
+		"updated_time": time.Now().Unix(),
+	}).Error
+	return err
+}
+
+//根据透析模式和患者id获取该患者的处方内容
+func PTemplateInformation(orgid, mode_id, patient_id int64) (tmp interface{}, err error) {
+	//获取处方id
+	var tt []*models.HisPrescriptionTemplate
+	err = XTReadDB().Raw("select id from his_prescription_template where status = 1 and user_org_id = ? and mode = ? and patient_id = ?", orgid, mode_id, patient_id).Scan(&tt).Error
+
+	if len(tt) > 1 {
+		err = fmt.Errorf("数据有误")
+		return
+	}
+	x := make(map[int64]string, 0) //项目
+	h := make(map[int64]string, 0) //耗材
+	for _, v := range tt {
+		var prescriptions []*models.HisPrescriptionInfoTemplateL
+		prescriptions, err = GetHisPrescriptionTemplateL(v.ID, orgid)
+		if err != nil {
+			return
+		}
+		for i := 0; i < len(prescriptions); i++ {
+			for j := 0; j < len(prescriptions[i].HisPrescriptionProjectTemplate); j++ {
+				if prescriptions[i].HisPrescriptionProjectTemplate[j].Type == 2 {
+					//项目
+					if v, ok := x[prescriptions[i].HisPrescriptionProjectTemplate[j].XtHisProject.StatisticalClassification]; ok {
+						prescriptions[i].HisPrescriptionProjectTemplate[j].XtHisProject.Translate = v
+					} else {
+						prescriptions[i].HisPrescriptionProjectTemplate[j].XtHisProject.Translate, err = TranslateZu(prescriptions[i].HisPrescriptionProjectTemplate[j].XtHisProject.StatisticalClassification, orgid, "统计分类")
+						if err != nil {
+							return
+						}
+						x[prescriptions[i].HisPrescriptionProjectTemplate[j].XtHisProject.StatisticalClassification] = prescriptions[i].HisPrescriptionProjectTemplate[j].XtHisProject.Translate
+					}
+
+				}
+				if prescriptions[i].HisPrescriptionProjectTemplate[j].Type == 3 {
+					//耗材
+					if v, ok := h[prescriptions[i].HisPrescriptionProjectTemplate[j].GoodInfo.GoodKind]; ok {
+						prescriptions[i].HisPrescriptionProjectTemplate[j].GoodInfo.Translate = v
+					} else {
+						prescriptions[i].HisPrescriptionProjectTemplate[j].GoodInfo.Translate = "耗材"
+						h[prescriptions[i].HisPrescriptionProjectTemplate[j].GoodInfo.GoodKind] = prescriptions[i].HisPrescriptionProjectTemplate[j].GoodInfo.Translate
+					}
+				}
+			}
+		}
+		tmp = prescriptions
+	}
+	return
+}
+func DeleteOne(types, id int64) (err error) {
+	if types == 1 {
+		//药品
+		err = XTWriteDB().Model(&models.HisPrescriptionAdviceTemplate{}).Where("id = ?", id).Updates(map[string]interface{}{
+			"status":       0,
+			"updated_time": time.Now().Unix(),
+		}).Error
+		if err != nil {
+			return
+		}
+	} else if types == 2 {
+		//项目
+		err = XTWriteDB().Model(&models.HisPrescriptionProjectTemplateL{}).Where("id = ?", id).Updates(map[string]interface{}{
+			"status": 0,
+			"mtime":  time.Now().Unix(),
+		}).Error
+		if err != nil {
+			return
+		}
+
+	} else {
+		err = fmt.Errorf("参数错误")
+		return
+	}
+	return
+
+}
+
+//收尾工作
+func Scavenger(orgid int64) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	//查询该机构的所有模板
+	var tmp1 []*models.HisPrescriptionTemplate
+	var tmp2 []*models.HisPrescriptionInfoTemplate
+	deltmp1 := make([]int64, 0) //清除的数据
+	deltmp2 := make([]int64, 0) //清除的数据
+	err = tx.Model(&models.HisPrescriptionTemplate{}).Where("user_org_id = ? and status = 1", orgid).Find(&tmp1).Error
+	if err != nil {
+		return
+	}
+	for _, v := range tmp1 {
+		var total1 int
+		tx.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? and p_template_id = ? and status = 1", orgid, v.ID).Count(&total1)
+		if total1 == 0 {
+			deltmp1 = append(deltmp1, v.ID)
+		}
+	}
+	err = tx.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? and status = 1", orgid).Find(&tmp2).Error
+	if err != nil {
+		return
+	}
+	for _, v := range tmp2 {
+		if v.Type == 1 {
+			var total2 int
+			tx.Model(&models.HisPrescriptionAdviceTemplate{}).Where("user_org_id = ? and prescription_id = ? and status = 1", orgid, v.ID).Count(&total2)
+			if total2 == 0 {
+				deltmp2 = append(deltmp2, v.ID)
+			}
+		}
+		if v.Type == 2 {
+			var total3 int
+			tx.Model(&models.HisPrescriptionProjectTemplate{}).Where("user_org_id = ? and prescription_id = ? and status = 1", orgid, v.ID).Count(&total3)
+			if total3 == 0 {
+				deltmp2 = append(deltmp2, v.ID)
+			}
+		}
+	}
+
+	//清除1
+	err = tx.Model(&models.HisPrescriptionTemplate{}).Where("id in (?)", deltmp1).Updates(map[string]interface{}{
+		"status": 0,
+		"mtime":  time.Now().Unix(),
+	}).Error
+	if err != nil {
+		return
+	}
+	//清除1
+	err = tx.Model(&models.HisPrescriptionInfoTemplate{}).Where("id in (?)", deltmp2).Updates(map[string]interface{}{
+		"status": 0,
+		"mtime":  time.Now().Unix(),
+	}).Error
+	if err != nil {
+		return
+	}
+
+	return
+}
+
+//分区和收费(患者发药
+func PartitionAndLayout(stime, etime, orgid, shift, partition int64, flist []*models.TmpPatient) (tmp []*models.TmpPatient, err error) {
+	//获取排班
+	var sch []*models.XtScheduleTwo
+	ma := make(map[int64]int64)
+	s := "user_org_id = ? and status = 1 and schedule_date >= ? and schedule_date <= ?"
+	if shift != 0 {
+		s = s + " and schedule_type = " + config.ToString(shift)
+	}
+	if partition != 0 {
+		s = s + " and partition_id = " + config.ToString(partition)
+	}
+	if shift == 0 && partition == 0 {
+		return flist, nil
+	}
+	err = XTWriteDB().Model(&models.XtScheduleTwo{}).Where(s, orgid, stime, etime).Find(&sch).Error
+	if err != nil {
+		return
+	}
+	for _, v := range sch {
+		ma[v.PatientId] = v.PatientId
+	}
+	for _, v := range flist {
+		if _, ok := ma[v.PatientID]; ok {
+			tmp = append(tmp, v)
+		}
+	}
+	return
+}
+
+//分区和收费(药品发药
+func PartitionAndLayoutDrug(deliveryway string, stime, etime, orgid, shift, partition int64, flist []*models.PatientInformation) (tmp []*models.PatientInformation, err error) {
+	//获取排班
+	var sch []*models.XtScheduleTwo
+	ma := make(map[int64]int64)
+	s := "user_org_id = ? and status = 1 and schedule_date >= ? and schedule_date <= ?"
+	if shift != 0 {
+		s = s + " and schedule_type = " + config.ToString(shift)
+	}
+	if partition != 0 {
+		s = s + " and partition_id = " + config.ToString(partition)
+	}
+	if shift == 0 && partition == 0 {
+		for _, v := range flist {
+			ma[v.PatientId] = v.PatientId
+		}
+		for _, v := range flist {
+			if _, ok := ma[v.PatientId]; ok && (v.Usage == deliveryway || deliveryway == "全部") {
+				tmp = append(tmp, v)
+			}
+		}
+		return tmp, nil
+	}
+	err = XTWriteDB().Model(&models.XtScheduleTwo{}).Where(s, orgid, stime, etime).Find(&sch).Error
+	if err != nil {
+		return
+	}
+	for _, v := range sch {
+		ma[v.PatientId] = v.PatientId
+	}
+
+	for _, v := range flist {
+		if _, ok := ma[v.PatientId]; ok && (v.Usage == deliveryway || deliveryway == "全部") {
+			tmp = append(tmp, v)
+		}
+	}
+	return
+}
+
+//给药途径
+func Administration(deliveryway string, orgid int64, flist []*models.ListOfDrugs) (tmp []*models.ListOfDrugs, err error) {
+	//查询药品
+	var pp []*models.PharmacyBaseDrug
+	s := "org_id = ? and status = 1"
+	if deliveryway == "全部" {
+		tmp = flist
+		return
+	} else {
+		s = s + " and delivery_way = '" + deliveryway + "'"
+	}
+	err = XTReadDB().Model(&models.PharmacyBaseDrug{}).Where(s, orgid).Find(&pp).Error
+	if err != nil {
+		return
+	}
+	ma := make(map[int64]int64)
+	for _, v := range pp {
+		ma[v.ID] = v.ID
+	}
+	for _, v := range flist {
+		if _, ok := ma[v.ID]; ok {
+			tmp = append(tmp, v)
+		}
+	}
+	return
+}
+
+//计算总量
+func CalculateTheTotalAmount(tmp []*models.PatientInformation, drug_id int64) (total string, err error) {
+	//获取药品信息
+	var t models.SpBaseDrug
+	err = XTReadDB().Model(&models.SpBaseDrug{}).Where("id = ?", drug_id).Find(&t).Error
+	if err != nil {
+		return
+	}
+	terr, maxunit, minunit := int64(0), int64(0), int64(0) //terr异常的单位数量，maxunit包装单位数量，minunit拆零单位数量
+	minmunber := t.MinNumber                               //拆零数量
+	terrUnit := ""
+	for _, v := range tmp {
+		switch v.Unit {
+		case t.MaxUnit:
+			maxunit = maxunit + v.Quantity
+		case t.MinUnit:
+			minunit = minunit + v.Quantity
+		default:
+			terr = terr + v.Quantity
+			terrUnit = v.Unit
+		}
+	}
+	if minunit >= minmunber {
+		if minmunber == 0 {
+			err = fmt.Errorf("拆零数量不能为零")
+			return
+		}
+		maxunit = maxunit + minunit/minmunber
+		minunit = minunit % minmunber
+
+	}
+	if terr > 0 {
+		total = total + config.ToString(terr) + terrUnit
+	}
+	if maxunit > 0 {
+		total = total + config.ToString(maxunit) + t.MaxUnit
+	}
+	if minunit > 0 {
+		total = total + config.ToString(minunit) + t.MinUnit
+	}
+
+	return
+}
+func GetAllValidDeviceZones02(orgID int64) ([]*models.DeviceZone, error) {
+	var zones []*models.DeviceZone
+	err := readDb.Model(&models.DeviceZone{}).Where("org_id = ? and status = 1", orgID).Find(&zones).Error
+	if err != nil {
+		return nil, err
+	}
+	return zones, nil
+}

service/stock_service.go

@@ -753,8 +753,13 @@ func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id in
 }
 
 func CreateDrugFlowTwo(flow *models.DrugFlow) error {
-
-	err := XTWriteDB().Create(&flow).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Create(&flow).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err error) {
@@ -4896,8 +4901,13 @@ func CreateStockFlow(warehousingInfo []*models.VmStockFlow) (err error) {
 }
 
 func CreateStockFlowOne(flow models.VmStockFlow) error {
-
-	err := XTWriteDB().Create(&flow).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Create(&flow).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -6564,8 +6574,13 @@ func ModifyGoodReduceInformationTwentyOne(good_id int64, waresing_count int64, s
 }
 
 func UpdateMedicalSumCount(drug_id int64, sum_count int64, sum_in_count int64, orgid int64) error {
-
-	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7080,8 +7095,13 @@ func UpdateWarehouseDetail(info *models.WarehousingInfo, id int64) error {
 }
 
 func UpdateCheckWarehouseInfo(id int64) error {
-
-	err := XTWriteDB().Model(&models.Warehousing{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.Warehousing{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7092,29 +7112,58 @@ func GetWarehouseInfoList(id int64, orgid int64) (info []*models.WarehousingInfo
 }
 
 func UpdateWarehouseInfoByIdList(count int64, id int64) error {
-
-	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
-	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func ReturnCheckWarehouseInfo(id int64) error {
-
-	err := XTWriteDB().Model(&models.Warehousing{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
-	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("warehousing_id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.Warehousing{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.WarehousingInfo{}).Where("warehousing_id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx.Commit()
 	return err
 }
 
 func UpdateWarehouseInfoByIdListTwo(count int64, id int64) error {
-
-	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
-	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func UpdateWarehouseInfoFlow(id int64) error {
+	tx := XTWriteDB().Begin()
+	err := tx.Model(models.VmStockFlow{}).Where("warehousing_detail_id =  ?", id).Update(map[string]interface{}{"status": 0}).Error
 
-	err := XTWriteDB().Model(models.VmStockFlow{}).Where("warehousing_detail_id =  ?", id).Update(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7158,8 +7207,13 @@ func UpdateWarehouseing(info *models.DrugWarehouseInfo) error {
 }
 
 func CheckWarehousingInfo(id int64, orgid int64) error {
-
-	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7170,41 +7224,89 @@ func GetWarehousingInfoByList(id int64, orgid int64) (info []*models.DrugWarehou
 }
 
 func AddDrugWarehouseStockMaxNumber(count int64, id int64) error {
-
-	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
-	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func UpdateWarehousingInfoFlow(id int64, orgid int64) error {
-
-	err := XTWriteDB().Model(&models.DrugFlow{}).Where("warehousing_detail_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugFlow{}).Where("warehousing_detail_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func AddDrugWarehouseStockMinNumber(count int64, id int64) error {
-
+	tx := XTWriteDB().Begin()
 	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
 	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	tx.Commit()
 	return err
 }
 
 func ReturnCheckWarehouseingInfo(id int64, orgid int64) error {
-
+	tx := XTWriteDB().Begin()
 	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
 	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("warehousing_id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func AddDrugReturnWarehouseStockMaxNumber(count int64, id int64) error {
-	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
-	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
 func AddDrugReturnWarehouseStockMinNumber(count int64, id int64) error {
-	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", count)).Error
-	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7318,8 +7420,13 @@ func UpdateGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64) er
 }
 
 func UpdateGoodInfoAddSumCount(goodid int64, sum_count int64, orgid int64) error {
-
-	err := XTReadDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 
@@ -7424,9 +7531,18 @@ func GetDrugAllStockInfo(storehouse_id int64, orgid int64, drugid int64) (info [
 }
 
 func UpdateBaseDrugSumInfo(sum_count int64, drugid int64, orgid int64, sum_in_count int64) error {
-
-	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
-	err = XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
+	tx := XTWriteDB().Begin()
+	err := tx.Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
 	return err
 }
 

src/golang.org/x/sync

@@ -0,0 +1 @@
+Subproject commit f12130a5280420d36872ab0a7717d160c768df46