历史排班

controllers/his_api_controller.go

@@ -3076,6 +3076,21 @@ func (c *HisApiController) CreateHisPrescription() {
 
 							}
 
+							if adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10265 {
+
+								if p.Type == 3 {
+									//查询该耗材是否停用
+									goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
+									//表示该耗材已经停用，不能保存
+									if goodInfoSeven.ID == 0 {
+										goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+										c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
+										return
+									}
+								}
+
+							}
+
 							service.CreateHisProjectTwo(&p)
 							//记录日志
 							byterequest, _ := json.Marshal(p)

controllers/manager_center_api_controller.go

@@ -37,6 +37,7 @@ func ManagerCenterRegistRouters() {
 	beego.Router("/api/dictionary/updatechildconfig", &ManagerCenterApiController{}, "Post:UpdateChildConfig")
 	beego.Router("/api/dictionary/deletechildconfig", &ManagerCenterApiController{}, "Post:DeleteChildConfig")
 	beego.Router("/api/dictionary/updatetemplate", &ManagerCenterApiController{}, "Post:UpdateTemplate")
+	beego.Router("/api/dictionary/getmanageconfiglist", &ManagerCenterApiController{}, "get,post:GetManageConfigList")
 
 	//经销商
 	beego.Router("/api/stock/dealer/create", &ManagerCenterApiController{}, "post:CreateDealer")
@@ -681,6 +682,16 @@ func (c *ManagerCenterApiController) GetConfigList() {
 
 }
 
+func (c *ManagerCenterApiController) GetManageConfigList() {
+	adminUserInfo := c.GetAdminUserInfo()
+	configList, _ := service.GetConfigList(adminUserInfo.CurrentOrgId)
+	fmt.Println("configListwowowowowowowowowowowowo", configList)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"configlist": configList,
+	})
+	return
+}
+
 // CreateConfig  创建配置信息
 func (c *ManagerCenterApiController) CreateConfig() {
 	adminUserInfo := c.GetAdminUserInfo()

controllers/patient_api_controller.go

@@ -722,6 +722,7 @@ func (c *PatientApiController) EditLapseto() {
 	end_time := c.GetString("end_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -778,6 +779,7 @@ func (c *PatientApiController) EditLapseto() {
 		return
 	}
 	lapsetoTime, _ := patientBody["lapseto_time"].(string)
+
 	//if len(lapsetoTime) == 0 {
 	//	utils.ErrorLog("len(lapsetoTime) == 0")
 	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
@@ -793,6 +795,7 @@ func (c *PatientApiController) EditLapseto() {
 	//}
 
 	lapsetoTimeUnix, err := time.ParseInLocation(timeLayout, lapsetoTime, loc)
+
 	//if err != nil {
 	//	utils.ErrorLog("lapsetoTimeUnix")
 	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)

service/common_service.go

@@ -481,7 +481,7 @@ func GetDialysisAgeData(orgID int64, lapsetotype int64, sourcetype int64) (count
 
 func GetCurentOrgPatients(orgid int64) (patients []*models.BloodXtPatients, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and status =1 and lapseto = 1", orgid).Order("created_time desc").Find(&patients).Error
+	err = XTReadDB().Where("user_org_id = ? and status =1", orgid).Order("created_time desc").Find(&patients).Error
 	return patients, err
 }
 

service/dialysis_service.go

@@ -1848,7 +1848,7 @@ func GetSchedulePrintList(page int64, limit int64, schedulType int64, partitionT
 	if len(keywords) > 0 {
 		db = db.Where("p.name like ?", likeKey)
 	}
-	err = db.Count(&total).Select("x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.status,p.name").Offset(limit * (page - 1)).Limit(limit).Order("x.schedule_date desc").Find(&list).Error
+	err = db.Count(&total).Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.status,p.name").Offset(limit * (page - 1)).Limit(limit).Order("x.schedule_date desc").Find(&list).Error
 
 	return list, total, err
 }

service/his_service.go

@@ -2817,3 +2817,10 @@ func GetChargeHisPatientList(org_id int64, record_date int64) (order []*HisOrder
 	err = readDb.Model(&models.HisOrder{}).Preload("Patients", "status = 1").Where("settle_accounts_date = ? and user_org_id = ? AND status = 1 and order_status = 2", record_date, org_id).Find(&order).Error
 	return
 }
+
+func GetGoodByIdIsStop(good_id int64, org_id int64) (models.GoodInfoSeven, error) {
+
+	goodInfoSeven := models.GoodInfoSeven{}
+	err = XTReadDB().Where("org_id = ? and status = 1 and find_in_set('停用',good_status) = 0 and id =?", org_id, good_id).Find(&goodInfoSeven).Error
+	return goodInfoSeven, err
+}

service/patient_service.go

@@ -1609,8 +1609,8 @@ func MobileGetMonitorsWithPatient(orgID int64, keyword string, page int) ([]*mod
 }
 
 func GetPatientByKeyWord(orgID int64, keywords string) (patient []*models.Patients, err error) {
-	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID)
-	fmt.Println("keywords22222223322332322332322323323", keywords)
+	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1", orgID)
+
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("name LIKE ? OR dialysis_no LIKE ? ", likekey, likekey).Find(&patient).Error

service/sign_service.go

@@ -273,15 +273,13 @@ func CreateUploadPact(contractcode string, contractname string, signcount int64,
 
 	maprequest := make(map[string]interface{})
 
-	//maprequest["contractCode"] = "102020620701056856"
-
 	maprequest["contractName"] = "电脑购买交易合同"
 
 	maprequest["signCount"] = 10
 
 	maprequest["docName"] = "日本员工保密协议"
 
-	file := "C:/Users/28169/Desktop/打印单.pdf"
+	file := "C:/Users/28169/Desktop/2.pdf"
 
 	fileBytes, err := ioutil.ReadFile(file) // 读取file
 
@@ -481,7 +479,7 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 	signFiles := make(map[string]interface{})
 
 	//创建合同返回
-	signFiles["docId"] = "158027977441935904"
+	signFiles["docId"] = "158807311102510183"
 
 	inputDataArr := make([]map[string]interface{}, 0)
 
@@ -491,8 +489,8 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 		xySignControls["key"] = "1"
 		xySignControls["type"] = "autograph"
 		xySignControls["pageNum"] = 1
-		xySignControls["positionX"] = "100F"
-		xySignControls["positionY"] = "100F"
+		xySignControls["positionX"] = "120F"
+		xySignControls["positionY"] = "120F"
 		inputDataArr = append(inputDataArr, xySignControls)
 
 	}
@@ -503,7 +501,7 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 		keywordSignControls["key"] = "2"
 		keywordSignControls["type"] = "date"
 		keywordSignControls["pageNum"] = 1
-		keywordSignControls["keyword"] = "护士"
+		keywordSignControls["keyword"] = "王志文"
 		keywordSignControls["offsetX"] = "100F"
 		keywordSignControls["offsetY"] = "100F"
 		inputDataArrTwo = append(inputDataArrTwo, keywordSignControls)
@@ -528,7 +526,7 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 	inputDataArrFour = append(inputDataArrFour, signersFiles)
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "158027977441935903"
+	maprequest["contractId"] = "158807311102510182"
 	maprequest["signers"] = inputDataArrFour
 
 	byterequest, _ := json.Marshal(maprequest)
@@ -605,21 +603,21 @@ func CreateBackStageSign(contractId string, signers string) string {
 
 	fmt.Println("signContorlwqowowo", signControl)
 	signFiles["signControl"] = signControl
-	signFiles["docId"] = "158027977441935904"
+	signFiles["docId"] = "158807311102510183"
 	inputDataArrThree := make([]map[string]interface{}, 0)
 	inputDataArrThree = append(inputDataArrThree, signFiles)
 
 	signer := make(map[string]interface{})
 
 	//添加合同签署人接口返回
-	signer["signerId"] = "158028978169315875"
+	signer["signerId"] = "158807462500107405"
 	signer["isUserWishes"] = true
 	signer["userWishesWay"] = 1
-	signer["codeNumber"] = "msg202308311013481137884"
-	signer["verifyCode"] = "488164"
+	signer["codeNumber"] = "msg202309081937527315153"
+	signer["verifyCode"] = "252234"
 	signer["signFiles"] = inputDataArrThree
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "158027977441935903"
+	maprequest["contractId"] = "158807311102510182"
 	maprequest["signer"] = signer
 
 	byterequest, _ := json.Marshal(maprequest)
@@ -665,7 +663,7 @@ func GetVerificationCode() string {
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "158027977441935903"
+	maprequest["contractId"] = "158807311102510182"
 	maprequest["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
 
 	byterequest, _ := json.Marshal(maprequest)
@@ -1165,7 +1163,7 @@ func GetContractId() string {
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "158027977441935903"
+	maprequest["contractId"] = "158799561907766048"
 	maprequest["responseContractFile"] = true
 
 	fmt.Println("request23222222222222222", maprequest)
@@ -1261,7 +1259,7 @@ func GetEnterPriseDetail() (string, string) {
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "158027977441935903"
+	maprequest["contractId"] = "158807311102510182"
 
 	byterequest, _ := json.Marshal(maprequest)
 	reader := bytes.NewReader(byterequest)