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

controllers/coordinate_controller.go

 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
-	patien_id := respJSON["patientId"].(string)
-	infoSeq := respJSON["infoSeq"].(string)
-	docId := respJSON["docId"].(string)
+	patien_id := respJSON["patientid"].(string)
+	infoSeq := respJSON["infoseq"].(string)
+	docId := respJSON["docid"].(string)
 	fmt.Println(patien_id)
 	fmt.Println(infoSeq)
 	fmt.Println(docId)
 
-	order, _ := service.GetHisOrderFour(patien_id, infoSeq, docId)
+	order, _ := service.GetHisOrderFour(patien_id, infoSeq, "")
+	order.SetlId = docId
 	if order.ID == 0 {
 		json := make(map[string]interface{})
 		json["msg"] = "结算记录不存在，请检查参数是否正确"
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		return
 	}
-	patien_id := respJSON["patientId"].(string)
-	infoSeq := respJSON["infoSeq"].(string)
-	docId := respJSON["docId"].(string)
+	patien_id := respJSON["patientid"].(string)
+	infoSeq := respJSON["infoseq"].(string)
+	docId := respJSON["docid"].(string)
 	order, _ := service.GetHisOrderFour(patien_id, infoSeq, docId)
 	if order.ID == 0 {
 		json := make(map[string]interface{})

controllers/role_controller.go

 	//透析管理
 	_, _, originDialysis := service.GetOtherAllGeneralPurviewVMsProcessed("/dialysis/manage")
 	//库房管理
-	_, _, originStock := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/manage")
+	_, _, originStock := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/manange")
 	//配置管理
 	//_, _, orginConfig := service.GetOtherAllGeneralPurviewVMsProcessed("/config/manage")
 
 	_, _, originSelfPreparedMedicinePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/selfPreparedMedicineIndex")
 	_, _, originOtherPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/other")
 
+	_, _, originCkPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/stock/warehousequery")
+
 	_, _, originIntegrationPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/integration/manage")
 	_, _, originTemplatePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/template/manage")
 	_, _, originDictMedicinePurview := service.GetOtherAllGeneralPurviewVMsProcessed("/dict/manage")
 		subOtherPurviewTreeViewModel = append(subOtherPurviewTreeViewModel, temp)
 	}
 
+	subCkPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	for _, item := range originCkPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subCkPurviewTreeViewModel = append(subCkPurviewTreeViewModel, temp)
+	}
+
 	subIntegrationPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
 	for _, item := range originIntegrationPurview {
 		temp := &service.PurviewTreeViewModel{
 		if item.Name == "其他管理" {
 			item.Childs = append(item.Childs, subOtherPurviewTreeViewModel...)
 		}
+		if item.Name == "仓库管理" {
+			item.Childs = append(item.Childs, subCkPurviewTreeViewModel...)
+		}
 
 	}
 

service/coordinate_service.go

 	//input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputData["patType"] = "1"                  // 就诊凭证编号
-	inputData["patIdNo"] = "440510199211080033" // 开始时间
-	inputData["patName"] = "测试患者"               // 人员姓名
+	inputData["patIdNo"] = "440510199211080038" // 开始时间
+	inputData["patName"] = "测试患者4"              // 人员姓名
 
 	inputData["patMobile"] = "13535547902" // 人员姓名
 	inputData["patSex"] = "M"              // 人员姓名
 	inputData["patMarriage"] = "1"         // 人员姓名
 	inputData["birthday"] = "1992-10-23"   // 人员姓名
 	inputData["patAddress"] = "11111"      // 人员姓名
-	inputData["thirdPartyID"] = "6933"     // 人员姓名
+	inputData["thirdPartyID"] = "6936"     // 人员姓名
 	inputData["patAge"] = "30"             // 人员姓名
 	//input["req"] = inputData
 
 	inputData["patientId"] = reg.PatientId
 	inputData["patientName"] = reg.PatientName
 	inputData["idCardNo"] = reg.IdCardNo
-	inputData["phone"] = "13535547901"
-	inputData["doctorId"] = "1111"
+	inputData["phone"] = ""
+	inputData["doctorId"] = ""
 	inputData["doctorLevelCode"] = ""
 	inputData["regDate"] = reg.RegDate
 
 
 	inputData["treatFee"] = reg.TreatFee
 	inputData["operatorId"] = reg.OperatorId
-	inputData["remark"] = "111111"
+	inputData["remark"] = "血透"
 
 	inputData["orderType"] = "0"
 	inputData["clinicCode"] = ""
 }
 
 func GetHisOrderFour(patient_id string, infoSeq string, docId string) (order models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("mdtrt_id = ? AND psn_no = ? AND setl_id = ?", infoSeq, patient_id, docId).First(&order).Error
+	if len(docId) > 0 {
+		err = readDb.Model(&models.HisOrder{}).Where("mdtrt_id = ? AND psn_no = ? AND setl_id = ? AND status = 1", infoSeq, patient_id, docId).First(&order).Error
+	} else {
+		err = readDb.Model(&models.HisOrder{}).Where("mdtrt_id = ? AND psn_no = ? AND status = 1 ", infoSeq, patient_id).First(&order).Error
+	}
 	return
 }