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

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10666 //机构id
+		subscibe.OrgId = 10489 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17997 //4
+		adminUserInfo.CurrentOrgId = 10489 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14655 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10666 //机构id小英9675或4
+		subscibe.OrgId = 10489 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17997 //4
+		adminUserInfo.CurrentOrgId = 10489 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14655 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -4417,6 +4417,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	doctorAdevieInfo, err := service.FindDoctorAdviceByInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
 	//获取上次的透后体重
 	//	assessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	assessmentAfterDislysis, _ := service.MobileGetLast(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
@@ -5387,6 +5388,12 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
+			if adminInfo.CurrentOrgId == 10694 || adminInfo.CurrentOrgId == 10697 {
+
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
+			}
+
 		}
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate
@@ -5423,6 +5430,11 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
 	}
 
+	if adminInfo.CurrentOrgId == 10697 || adminInfo.CurrentOrgId == 10694 {
+		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate * 1000)
+		record.UltrafiltrationVolume = ultrafiltration_volume / 1000
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"monitor": record,
 	})

controllers/dialysis_record_api_controller.go

@@ -1290,6 +1290,12 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 				}
 
+				if adminUserInfo.CurrentOrgId == 10694 || adminUserInfo.CurrentOrgId == 10697 {
+
+					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+					ultrafiltration_rate = ultrafiltration_rate / 1000
+				}
+
 			}
 		}
 		record := models.MonitoringRecord{

controllers/his_api_controller.go

@@ -2993,7 +2993,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											}
 
-											service.DeleteAutoWarehouse(patient_id, recordDateTime)
+											//service.DeleteAutoWarehouse(patient_id, recordDateTime)
 
 										}
 
@@ -3046,7 +3046,7 @@ func (c *HisApiController) CreateHisPrescription() {
 													service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, item.OrgId)
 												}
 
-												service.DeleteAutoWarehouse(patient_id, recordDateTime)
+												//service.DeleteAutoWarehouse(patient_id, recordDateTime)
 
 											}
 
@@ -3176,7 +3176,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10666 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3425,10 +3425,10 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										}
 
-										fmt.Println("药品名称----------------------", drug.DrugName)
-										fmt.Println("药品名称----------------------", drug.IsUse)
-										fmt.Println("is_user_total-------------------------", is_user_total)
-										fmt.Println("no_user_total-------------------------", no_user_total)
+										//fmt.Println("药品名称----------------------", drug.DrugName)
+										//fmt.Println("药品名称----------------------", drug.IsUse)
+										//fmt.Println("is_user_total-------------------------", is_user_total)
+										//fmt.Println("no_user_total-------------------------", no_user_total)
 
 										if is_user_total != no_user_total {
 											//出库

controllers/his_project_api_controller.go

@@ -132,6 +132,7 @@ func (this *HisProjectApiController) SaveProject() {
 	bby01 := this.GetString("bby01")
 
 	is_print, _ := this.GetInt64("is_print")
+	is_show, _ := this.GetInt64("is_show")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
@@ -191,6 +192,7 @@ func (this *HisProjectApiController) SaveProject() {
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
 		FirstLetter:                 firstLetter,
+		IsShow:                      is_show,
 	}
 	if this.GetAdminUserInfo().CurrentOrgId == 10206 {
 		de, _ := service.GetDepartMentDetail(executive_section)
@@ -292,6 +294,7 @@ func (this *HisProjectApiController) UpdatedProject() {
 	is_print, _ := this.GetInt64("is_print")
 	bbx01 := this.GetString("bbx01")
 	bby01 := this.GetString("bby01")
+	is_show, _ := this.GetInt64("is_show")
 	// 创建一个拼音转换器
 	p := pinyin.NewArgs()
 
@@ -347,6 +350,7 @@ func (this *HisProjectApiController) UpdatedProject() {
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
 		UserOrgId:                   orgId,
+		IsShow:                      is_show,
 	}
 	if this.GetAdminUserInfo().CurrentOrgId == 10206 {
 		de, _ := service.GetDepartMentDetail(executive_section)

controllers/manager_center_api_controller.go

@@ -162,6 +162,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	bbx01 := c.GetString("bbx01")
 	bby01 := c.GetString("bby01")
 	is_project, _ := c.GetInt64("is_project")
+	is_show, _ := c.GetInt64("is_show")
 	adminInfo := c.GetAdminUserInfo()
 
 	hans := drug_name // 要转换的汉字字符串
@@ -252,6 +253,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		Bbx01:                       bbx01,
 		Bck01b:                      "10",
 		IsProject:                   is_project,
+		IsShow:                      is_show,
 	}
 	drugLib.FirstLetter = firstLetter
 	drugLib.Pinyin = firstLetter
@@ -363,6 +365,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	bbx01 := c.GetString("bbx01")
 	bby01 := c.GetString("bby01")
 	is_project, _ := c.GetInt64("is_project")
+	is_show, _ := c.GetInt64("is_show")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -457,6 +460,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		Bck01b:                      "10",
 		IsProject:                   is_project,
 		FirstLetter:                 firstLetter,
+		IsShow:                      is_show,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
 
@@ -1600,7 +1604,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	is_warehouse, _ := c.GetInt64("is_warehouse")
 	bbx01 := c.GetString("bbx01")
 	bby01 := c.GetString("bby01")
-
+	is_show, _ := c.GetInt64("is_show")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
@@ -1683,6 +1687,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
 		Bck01b:                      "55",
+		IsShow:                      is_show,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1752,7 +1757,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	is_warehouse, _ := c.GetInt64("is_warehouse")
 	bbx01 := c.GetString("bbx01")
 	bby01 := c.GetString("bby01")
-
+	is_show, _ := c.GetInt64("is_show")
 	// 创建一个拼音转换器
 	p := pinyin.NewArgs()
 
@@ -1827,6 +1832,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
 		Bck01b:                      "55",
+		IsShow:                      is_show,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -102,6 +102,21 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 			if err == gorm.ErrRecordNotFound {
 				if lastPredialysisEvaluation != nil {
 					evaluation.DryWeight = lastPredialysisEvaluation.DryWeight
+					evaluation.InternalFistula = lastPredialysisEvaluation.InternalFistula
+					evaluation.InternalFistulaSkin = lastPredialysisEvaluation.InternalFistulaSkin
+					evaluation.VenousCatheterization = lastPredialysisEvaluation.VenousCatheterization
+					evaluation.Catheter = lastPredialysisEvaluation.Catheter
+					evaluation.CatheterBend = lastPredialysisEvaluation.CatheterBend
+					evaluation.PunctureNeedle = lastPredialysisEvaluation.PunctureNeedle
+					evaluation.PunctureNeedleDirection = lastPredialysisEvaluation.PunctureNeedleDirection
+					evaluation.PunctureWay = lastPredialysisEvaluation.PunctureWay
+					evaluation.PointPuncture = lastPredialysisEvaluation.PointPuncture
+					evaluation.IsHemorrhage = lastPredialysisEvaluation.IsHemorrhage
+					evaluation.ThromubusType = lastPredialysisEvaluation.ThromubusType
+					evaluation.Skin = lastPredialysisEvaluation.Skin
+					evaluation.Complication = lastPredialysisEvaluation.Complication
+					evaluation.SymptomBeforeDialysis = lastPredialysisEvaluation.SymptomBeforeDialysis
+					evaluation.LastPostDialysisOther = lastPredialysisEvaluation.LastPostDialysisOther
 				} else {
 					evaluation.DryWeight = 0
 				}
@@ -118,10 +133,27 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 				evaluation.BloodAccessPartOperaId = lastPredialysisEvaluation.BloodAccessPartOperaId
 				evaluation.AdditionalWeight = lastPredialysisEvaluation.AdditionalWeight // 衣物重
 
+				evaluation.InternalFistula = lastPredialysisEvaluation.InternalFistula
+				evaluation.InternalFistulaSkin = lastPredialysisEvaluation.InternalFistulaSkin
+				evaluation.VenousCatheterization = lastPredialysisEvaluation.VenousCatheterization
+				evaluation.Catheter = lastPredialysisEvaluation.Catheter
+				evaluation.CatheterBend = lastPredialysisEvaluation.CatheterBend
+				evaluation.PunctureNeedle = lastPredialysisEvaluation.PunctureNeedle
+				evaluation.PunctureNeedleDirection = lastPredialysisEvaluation.PunctureNeedleDirection
+				evaluation.PunctureWay = lastPredialysisEvaluation.PunctureWay
+				evaluation.PointPuncture = lastPredialysisEvaluation.PointPuncture
+				evaluation.IsHemorrhage = lastPredialysisEvaluation.IsHemorrhage
+				evaluation.ThromubusType = lastPredialysisEvaluation.ThromubusType
+				evaluation.Skin = lastPredialysisEvaluation.Skin
+				evaluation.Complication = lastPredialysisEvaluation.Complication
+				evaluation.SymptomBeforeDialysis = lastPredialysisEvaluation.SymptomBeforeDialysis
+				evaluation.LastPostDialysisOther = lastPredialysisEvaluation.LastPostDialysisOther
+
 				//从化益达 备注默认上一次数据
 				if adminUserInfo.Org.Id == 10318 {
 					evaluation.Remark = lastPredialysisEvaluation.Remark
 				}
+
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()
@@ -129,7 +161,8 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 
 		evaluation.SystolicBloodPressure = systolic_blood_pressure   // 收缩压
 		evaluation.DiastolicBloodPressure = diastolic_blood_pressure // 舒张压
-		evaluation.PulseFrequency = pulse_frequency                  // 脉率
+		evaluation.PulseFrequency = pulse_frequency
+		// 脉率
 
 		evaluation.AssessmentTime = time.Now().Unix()
 
@@ -401,7 +434,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.PrescribingNumber = 1
 			newprescribe.BloodAccessPartId = dialysisSolution.BloodAccessPartId
 			newprescribe.Status = 1
-			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 {
+			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 && adminUserInfo.Org.Id != 10016 {
 				newprescribe.Remark = dialysisSolution.Remark
 			}
 
@@ -431,7 +464,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 
 			//恒泰
-			if adminUserInfo.Org.Id == 10490 {
+			if adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 {
 				newprescribe.Remark = ""
 			}
 
@@ -555,7 +588,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				//} else {
 				//	newprescribe.Remark = ""
 				//}
-				if adminUserInfo.Org.Id == 10490 {
+				if adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 {
 					newprescribe.Remark = ""
 				}
 
@@ -884,7 +917,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing                   //针眼
 
 				evaluation.Remark = lastPredialysisEvaluation.Remark
-				if adminUserInfo.Org.Id == 10318 || adminUserInfo.Org.Id == 10490 {
+				if adminUserInfo.Org.Id == 10318 || adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 {
 					evaluation.Remark = ""
 				}
 				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10447 {

controllers/sign_api_controller.go

@@ -5,10 +5,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"strconv"
 	"time"
 
 	"XT_New/models"
 	"XT_New/service"
+	"XT_New/utils"
 	"github.com/astaxie/beego"
 )
 
@@ -96,6 +98,8 @@ func SignApiRegistRouters() {
 	//显示字段脚本
 	beego.Router("/api/device/getfieldconfiglist", &SignApiController{}, "Get:GetFieldConfigList")
 
+	beego.Router("/api/device/tocheckquery", &SignApiController{}, "Get:ToCheckQuery")
+
 }
 
 // 短信服务接口
@@ -1347,3 +1351,141 @@ func (this *SignApiController) GetFieldConfigList() {
 		"msg": "ok",
 	})
 }
+
+// 校验库存的脚本
+func (this *SignApiController) ToCheckQuery() {
+
+	//获取监测监控的库存情况
+
+	queryList, _ := service.GetAllCheckQuery()
+
+	var recordDateStr = time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	if len(queryList) > 0 {
+		for _, item := range queryList {
+			//查询今日该机构总的医嘱数量
+			adviceList, _ := service.GetAllDoctorAdviceQueryList(item.UserOrgId, recordDate.Unix())
+			if len(adviceList) > 0 {
+
+				for _, it := range adviceList {
+					var prescription_count int64
+					var out_count int64
+					advice, _ := service.GetDrugListById(it.DrugId, it.AdviceDate, it.PatientId)
+					medical, _ := service.GetBaseDrugMedical(it.DrugId)
+					if len(advice) > 0 {
+						for _, its := range advice {
+							prescribingNumberSix := strconv.FormatFloat(its.PrescribingNumber, 'f', -1, 64)
+							prescribingNumberSeven, _ := strconv.ParseInt(prescribingNumberSix, 10, 64)
+							if its.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+								prescription_count += prescribingNumberSeven * medical.MinNumber
+							}
+
+							if its.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+								prescription_count += prescribingNumberSeven
+							}
+
+							if its.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+								prescription_count += prescribingNumberSeven
+							}
+						}
+					}
+
+					outinfo, _ := service.GetDrugWarehouseOutQueryListById(it.DrugId, it.AdviceDate, it.PatientId)
+
+					if len(outinfo) > 0 {
+						for _, s := range outinfo {
+							if s.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+								out_count += s.Count * medical.MinNumber
+							}
+
+							if s.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+								out_count += s.Count
+							}
+
+							if s.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+								out_count += s.Count
+							}
+						}
+					}
+
+					patients, _ := service.GetPatientName(it.PatientId)
+
+					var specifaciton_name string
+
+					specifaciton_name = medical.Dose + medical.DoseUnit + "*" + strconv.FormatInt(medical.MinNumber, 10) + medical.MinUnit + "/" + medical.MaxUnit
+
+					//如果当天医嘱数量和出库数量不一致，那么则插入到数据库
+					if prescription_count != out_count {
+
+						checkQuery := models.XtDrugCheckQuery{
+							DrugId:            it.DrugId,
+							RecordDate:        it.AdviceDate,
+							AdviceCount:       prescription_count,
+							OutCount:          out_count,
+							PatientId:         it.PatientId,
+							UserOrgId:         it.UserOrgId,
+							ExecutionState:    it.ExecutionState,
+							IsMedicine:        it.IsMedicine,
+							DrugName:          medical.DrugName,
+							SpecificationName: specifaciton_name,
+							Name:              patients.Name,
+						}
+
+						service.CreateCheckQuery(checkQuery)
+					}
+
+				}
+
+			}
+
+			//查询今日改机构耗材的总的医嘱数量
+			projectList, _ := service.GetAllPrescriptionProjectList(item.UserOrgId, recordDate.Unix())
+			if len(projectList) > 0 {
+
+				for _, item := range projectList {
+					var prescription_count int64
+					var out_count int64
+					project, _ := service.GetProjectListByPatient(item.PatientId, item.ProjectId, item.RecordDate)
+					for _, its := range project {
+						count, _ := strconv.ParseInt(its.Count, 10, 64)
+						prescription_count += count
+					}
+
+					outList, _ := service.GetWarehosueOutQueryList(item.PatientId, item.ProjectId, item.RecordDate)
+					for _, s := range outList {
+						out_count += s.Count
+					}
+
+					goodIdThirty, _ := service.GetGoodInformationByGoodIdThirty(item.ProjectId)
+
+					patients, _ := service.GetPatientName(item.PatientId)
+
+					//fmt.Println("hahhahahahahhh", item.ProjectId)
+					//fmt.Println("prescription_count", prescription_count)
+					//fmt.Println("out_count", out_count)
+					if prescription_count != out_count {
+
+						stockCheckQuery := models.XtStockCheckQuery{
+							GoodId:            item.ProjectId,
+							RecordDate:        item.RecordDate,
+							AdviceCount:       prescription_count,
+							OutCount:          out_count,
+							PatientId:         item.PatientId,
+							UserOrgId:         item.UserOrgId,
+							GoodName:          goodIdThirty.GoodName,
+							SpecificationName: goodIdThirty.SpecificationName,
+							Name:              patients.Name,
+						}
+
+						service.CreteStockCheckQuery(stockCheckQuery)
+					}
+				}
+
+			}
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}

controllers/stock_in_api_controller.go

@@ -4784,6 +4784,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				LimitRemark:                 item.LimitRemark,
 				DrugCategory:                item.DrugCategory,
 				DrugDose:                    item.DrugDose,
+				SingleDose:                  item.DrugDose,
 				DrugDoseUnit:                item.DrugDoseUnit,
 				LmtUsedFlag:                 item.LmtUsedFlag,
 				DrugDay:                     item.DrugDay,

models/data_models.go

@@ -207,3 +207,49 @@ type XtPatientDiagnose struct {
 func (XtPatientDiagnose) TableName() string {
 	return "xt_patient_diagnose"
 }
+
+type XtDrugQuery 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"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDrugQuery) TableName() string {
+	return "xt_drug_query"
+}
+
+type XtDrugCheckQuery struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugId            int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	RecordDate        int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	AdviceCount       int64  `gorm:"column:advice_count" json:"advice_count" form:"advice_count"`
+	OutCount          int64  `gorm:"column:out_count" json:"out_count" form:"out_count"`
+	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ExecutionState    int64  `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	IsMedicine        int64  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	DrugName          string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	Name              string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (XtDrugCheckQuery) TableName() string {
+	return "xt_drug_check_query"
+}
+
+type XtStockCheckQuery struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	RecordDate        int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	AdviceCount       int64  `gorm:"column:advice_count" json:"advice_count" form:"advice_count"`
+	OutCount          int64  `gorm:"column:out_count" json:"out_count" form:"out_count"`
+	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	Name              string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (XtStockCheckQuery) TableName() string {
+	return "xt_stock_check_query"
+}

models/drug.go

@@ -88,6 +88,7 @@ type BaseDrugLib struct {
 	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	IsProject          int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
 	DrugDosageFormName string `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
+	IsShow             int64  `gorm:"column:is_show" json:"is_show" form:"is_show"`
 }
 
 func (BaseDrugLib) TableName() string {

models/drug_stock.go

@@ -462,9 +462,6 @@ type DrugFlow struct {
 	Remark                    string                 `gorm:"column:remark" json:"remark" form:"remark"`
 	OperateTime               int64                  `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
 	SaleDate                  string                 `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
-	PCount                    float64
-	SDate                     string
-	PDate                     int64
 }
 
 func (DrugFlow) TableName() string {

models/good_models.go

@@ -148,6 +148,7 @@ type GoodInfo struct {
 	SumOutCount                      int64          `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
 	SumCancelCount                   int64          `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
 	TotalCount                       int64          `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	IsShow                           int64          `gorm:"column:is_show" json:"is_show" form:"is_show"`
 }
 
 func (GoodInfo) TableName() string {

models/his_models.go

@@ -49,6 +49,7 @@ type XtHisProject struct {
 	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
 	ZuobiaoId                   string  `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
 	Bck01b                      string  `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	IsShow                      int64   `gorm:"column:is_show" json:"is_show" form:"is_show"`
 }
 
 func (XtHisProject) TableName() string {
@@ -617,6 +618,7 @@ type HisProject struct {
 	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	Bbx01                       int64   `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 	Bby01                       int64   `gorm:"column:bby01" json:"bby01" form:"bby01"`
+	IsShow                      int64   `gorm:"column:is_show" json:"is_show" form:"is_show"`
 }
 
 func (HisProject) TableName() string {

models/self_drug_models.go

@@ -79,6 +79,7 @@ type XtBaseDrug struct {
 	DrugDosageFormName     string  `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
 	TotalCountOne          int64   `gorm:"column:total_count_one" json:"total_count" form:"total_count_one"`
 	TotalCountTwo          int64   `gorm:"column:total_count_two" json:"total_count_two" form:"total_count_two"`
+	IsShow                 int64   `gorm:"column:is_show" json:"is_show" form:"is_show"`
 }
 
 func (XtBaseDrug) TableName() string {

service/dialysis_service.go

@@ -2500,9 +2500,15 @@ func GetAllAdviceList(patient_id int64, advice_date int64, user_org_id int64) (a
 	return advice, err
 }
 
-func GetHistoryWarehouseOutInfo(patient_id int64, user_org_id int64, record_time int64, good_id int64) (outInfo []*models.WarehouseOutInfo, err error) {
+func GetHistoryWarehouseOutInfo(patient_id int64, user_org_id int64, record_time int64, good_id int64, tx *gorm.DB) (outInfo []*models.WarehouseOutInfo, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and org_id = ? and sys_record_time = ? and status =1 and good_id = ?", patient_id, user_org_id, record_time, good_id).Find(&outInfo).Error
+	err = tx.Where("patient_id = ? and org_id = ? and sys_record_time = ? and status =1 and good_id = ?", patient_id, user_org_id, record_time, good_id).Find(&outInfo).Error
 
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return
+		}
+	}
 	return outInfo, err
 }

service/gobal_config_service.go

@@ -185,7 +185,7 @@ func GetPrint(ids []int64, orgid int64, advicetype int64, stoptype int64) (docto
 			db = db.Where("stop_state = ?", stoptype)
 		}
 
-		err = db.Where("groupno = ?", ids[0]).Find(&doctor).Error
+		err = db.Where("groupno = ?", ids[0]).Order("advice_date asc").Find(&doctor).Error
 	} else {
 		if orgid > 0 {
 			db = db.Where("user_org_id = ?", orgid)
@@ -196,7 +196,7 @@ func GetPrint(ids []int64, orgid int64, advicetype int64, stoptype int64) (docto
 		if stoptype > 0 {
 			db = db.Where("stop_state = ?", stoptype)
 		}
-		err = db.Where("groupno IN(?)", ids).Find(&doctor).Error
+		err = db.Where("groupno IN(?)", ids).Order("advice_date asc").Find(&doctor).Error
 	}
 
 	return doctor, err

service/his_project_service.go

@@ -60,7 +60,7 @@ func GetProjectDetail(id int64) (models.XtHisProject, error) {
 
 func UpdatedProject(id int64, pro *models.XtHisProject) error {
 
-	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate, "is_print": pro.IsPrint, "bbx01": pro.Bbx01, "bby01": pro.Bby01, "zuobiao_id": pro.ZuobiaoId, "bck01b": pro.Bck01b}).Error
+	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate, "is_print": pro.IsPrint, "bbx01": pro.Bbx01, "bby01": pro.Bby01, "zuobiao_id": pro.ZuobiaoId, "bck01b": pro.Bck01b, "is_show": pro.IsShow}).Error
 	return err
 }
 

service/inspection_service.go

@@ -404,7 +404,7 @@ func GetInSpctionRerefce(project_id int64, user_org_id int64) (inspct []*models.
 
 func GetInspectionGroupByRecordDate(patient_id int64, project_id int64, org_id int64) (inspetion []*models.Inspection, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ? and status=1", patient_id, project_id, org_id).Order("inspect_date asc").Limit(10).Group("inspect_date").Find(&inspetion).Error
+	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ? and status=1", patient_id, project_id, org_id).Order("inspect_date desc").Limit(10).Group("inspect_date").Find(&inspetion).Error
 
 	return inspetion, err
 }

service/mobile_dialysis_service.go

@@ -56,7 +56,7 @@ func GetMonitDialysisSolution(user_org_id int64, patient_id int64, mode_id int64
 
 	solution := models.DialysisSolution{}
 
-	err := XTReadDB().Where("user_org_id = ? and patient_id =? and solution_status = 1 and mode_id = ?", user_org_id, patient_id, mode_id).Find(&solution).Error
+	err := XTReadDB().Where("user_org_id = ? and patient_id =? and solution_status = 1 and mode_id = ? and status=1", user_org_id, patient_id, mode_id).Find(&solution).Error
 
 	return &solution, err
 }
@@ -2867,6 +2867,11 @@ func FindConsumablesByDateThree(orgID int64, patient_id int64, recordDate int64)
 	return
 }
 
+func FindHisPrescription(orgID int64, patient_id int64, recordDate int64) (project []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1 and type =3", orgID, patient_id, recordDate).Find(&project).Error
+	return
+}
+
 //func FindLastConsumables(orgID int64, patient_id int64, recordDate int64) (consumables []*models.DialysisBeforePrepare, err error){
 //	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1", orgID, patient_id,recordDate).Find(&consumables).Error
 //	return
@@ -9923,3 +9928,11 @@ func GetLastAcceptTreatment(user_org_id int64, patient_id int64) (models.Receive
 	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and status=1 and admission_number<>''", user_org_id, patient_id).Last(&treatmentAsses).Error
 	return treatmentAsses, err
 }
+
+func GetDrugIsShow(id int64, org_id int64) (models.XtBaseDrug, error) {
+
+	baseDrug := models.XtBaseDrug{}
+	err := XTReadDB().Where("id = ? and status =1 and org_id = ?", id, org_id).Find(&baseDrug).Error
+
+	return baseDrug, err
+}

service/sign_service.go

@@ -2269,3 +2269,65 @@ func GetFieldConfigList(user_org_id int64) (filedConfig []*models.FiledConfig, e
 	return filedConfig, err
 
 }
+
+func GetAllCheckQuery() (query []*models.XtDrugQuery, err error) {
+
+	err = XTReadDB().Where("status=1").Find(&query).Error
+
+	return query, err
+}
+
+func GetAllDoctorAdviceQueryList(user_org_id int64, advice_date int64) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status=1", user_org_id, advice_date).Find(&advice).Error
+
+	return advice, err
+}
+
+func GetDrugListById(drug_id int64, advice_date int64, patient_id int64) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and status =1 and advice_date = ? and patient_id =?", drug_id, advice_date, patient_id).Find(&advice).Error
+
+	return advice, err
+}
+
+func GetDrugWarehouseOutQueryListById(drug_id int64, sys_record_date int64, patient_id int64) (outinfo []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and sys_record_time = ? and status =1 and patient_id = ?", drug_id, sys_record_date, patient_id).Find(&outinfo).Error
+
+	return outinfo, err
+}
+
+func CreateCheckQuery(query models.XtDrugCheckQuery) error {
+
+	err := XTWriteDB().Create(&query).Error
+
+	return err
+}
+
+func GetAllPrescriptionProjectList(user_org_id int64, record_date int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and record_date = ? and status =1 and type =3", user_org_id, record_date).Find(&project).Error
+
+	return project, err
+}
+
+func GetProjectListByPatient(patient_id int64, project_id int64, record_date int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("patient_id =? and project_id = ? and record_date =?", patient_id, project_id, record_date).Find(&project).Error
+
+	return project, err
+}
+
+func GetWarehosueOutQueryList(patient_id int64, project_id int64, record_date int64) (out []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and good_id = ? and sys_record_time = ? and status=1", patient_id, project_id, record_date).Find(&out).Error
+	return out, err
+}
+
+func CreteStockCheckQuery(query models.XtStockCheckQuery) error {
+
+	err := XTWriteDB().Create(&query).Error
+
+	return err
+}

service/stock_service.go

@@ -278,6 +278,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"bby01":                          goodInfo.Bby01,
 		"zuobiao_id":                     goodInfo.Bbx01,
 		"first_letter":                   goodInfo.FirstLetter,
+		"is_show":                        goodInfo.IsShow,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})
@@ -3848,7 +3849,7 @@ func CreateDrugsInfomation(info *models.BaseDrugLib) error {
 
 func UpdateDrugsInformation(drug *models.BaseDrugLib, drugName string, drugSpec string, orgid int64) error {
 
-	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark, "drug_dose": drug.DrugDose, "drug_dose_unit": drug.DrugDoseUnit, "lmt_used_flag": drug.LmtUsedFlag, "delivery_way": drug.DeliveryWay, "execution_frequency": drug.ExecutionFrequency, "drug_day": drug.DrugDay}).Error
+	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark, "drug_dose": drug.DrugDose, "single_dose": drug.DrugDose, "drug_dose_unit": drug.DrugDoseUnit, "lmt_used_flag": drug.LmtUsedFlag, "delivery_way": drug.DeliveryWay, "execution_frequency": drug.ExecutionFrequency, "drug_day": drug.DrugDay}).Error
 	return err
 }