修个部分问题

controllers/base_api_controller.go

@@ -136,9 +136,9 @@ func (this *BaseAuthAPIController) Prepare() {
 			allPermission, _ := service.GetAllFunctionPurview()
 
 			for _, item := range allPermission {
-				fmt.Println(len(strings.Split(item.Urlfor, ",")))
+				// fmt.Println(len(strings.Split(item.Urlfor, ",")))
 
-				fmt.Println(strings.Split(item.Urlfor, ","))
+				// fmt.Println(strings.Split(item.Urlfor, ","))
 				//fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 
 				//判断当前路由是否在权限路由列表里面
@@ -204,8 +204,8 @@ func (this *BaseAuthAPIController) Prepare() {
 			allPermission, _ := service.GetAllFunctionPurview()
 
 			for _, item := range allPermission {
-				fmt.Println(strings.Split(item.Urlfor, ",")[2])
-				fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+				// fmt.Println(strings.Split(item.Urlfor, ",")[2])
+				// fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 
 				//判断当前路由是否在权限路由列表里面
 				if strings.Split(item.Urlfor, ",")[2] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {

controllers/dialysis_api_controller.go

@@ -3308,6 +3308,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		var mode_id int64
 		if schedual != nil {
 			dialysisPrescribe, _ = service.MobileGetDialysisPrescribeByModeId(adminUserInfo.CurrentOrgId, patient, recordDate.Unix(), schedual.ModeId)
+			if dialysisPrescribe == nil {
+				dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+			}
 			lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeId(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
 			// 获取透析模版
 			dialysisSolution, _ = service.MobileGetDialysisSolutionByModeId(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)

controllers/inspection_api_controller.go

@@ -124,10 +124,10 @@ func (c *InspectionApiController) CreatePatientInspection() {
 		return
 	}
 
-	timeLayout := "2006-01-02 15:04:05"
+	timeLayout := "2006-01-02 15:04"
 	loc, _ := time.LoadLocation("Local")
 
-	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate+" 00:00:00", loc)
+	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate, loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
@@ -226,13 +226,11 @@ func (c *InspectionApiController) CreatePatientInspection() {
 }
 
 func (c *InspectionApiController) EditPatientInspection() {
-	fmt.Println("触发了没有---------------------------------------")
 	patient, _ := c.GetInt64("patient", 0)
 	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
-	dates := c.GetString("dates")
-	projectid := c.GetString("projectid")
-	fmt.Println("日期---", dates)
-	fmt.Println("projectid", projectid)
+	// dates := c.GetString("dates")
+	// projectid := c.GetString("projectid")
+
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -253,23 +251,31 @@ func (c *InspectionApiController) EditPatientInspection() {
 		return
 	}
 
-	timeLayout := "2006-01-02 15:04:05"
+	timeLayout := "2006-01-02 15:04"
 	loc, _ := time.LoadLocation("Local")
 
-	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate+" 00:00:00", loc)
+	theTime, err := time.ParseInLocation(timeLayout, from.InspectDate , loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
 		return
 	}
 
+	oldTime, olderr := time.ParseInLocation(timeLayout, from.OldInspectDate , loc)
+	if olderr != nil {
+		utils.ErrorLog(olderr.Error())
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")
+		return
+	}
+
 	if len(from.FormItem) == 0 {
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "未填写项目")
 		return
 	}
 
 	date := theTime.Unix()
-	insp, err := service.GetPatientInspectionByDate(adminUserInfo.CurrentOrgId, patient, date, from.ProjectId)
+	oldDate := oldTime.Unix()
+	insp, err := service.GetPatientInspectionByDate(adminUserInfo.CurrentOrgId, patient, oldDate, from.ProjectId)
 	if err != nil {
 		utils.ErrorLog("%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -306,10 +312,10 @@ func (c *InspectionApiController) EditPatientInspection() {
 			inspection.CreatedTime = time.Now().Unix()
 			inspection.UpdatedTime = time.Now().Unix()
 			addinsp = append(addinsp, inspection)
-		} else if _, exi := inspMap[item.ID]; exi {
-			fmt.Println("2222222222")
+		} else {
 			inspection := *inspMap[item.ID]
 			inspection.InspectValue = item.Value
+			inspection.InspectDate = date
 			inspection.UpdatedTime = time.Now().Unix()
 			editinsp = append(editinsp, inspection)
 			noMap = append(noMap, item.ID)
@@ -373,15 +379,15 @@ func (c *InspectionApiController) DeletePatientInspection() {
 	patient, _ := c.GetInt64("patient", 0)
 	ProjectId, _ := c.GetInt64("project_id", 0)
 	InspectDate := c.GetString("date")
-	if patient <= 0 || ProjectId <= 0 || len(InspectDate) != 10 {
+	if patient <= 0 || ProjectId <= 0 || len(InspectDate) < 10 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 
-	timeLayout := "2006-01-02 15:04:05"
+	timeLayout := "2006-01-02 15:04"
 	loc, _ := time.LoadLocation("Local")
 
-	theTime, err := time.ParseInLocation(timeLayout, InspectDate+" 00:00:00", loc)
+	theTime, err := time.ParseInLocation(timeLayout, InspectDate, loc)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "检验日期不正确")

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -135,8 +135,8 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			allPermission, _ := service.GetAllFunctionPurview()
 
 			for _, item := range allPermission {
-				fmt.Println(strings.Split(item.Urlfor, ",")[0])
-				fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+				// fmt.Println(strings.Split(item.Urlfor, ",")[0])
+				// fmt.Println(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 
 				//判断当前路由是否在权限路由列表里面
 				if strings.Split(item.Urlfor, ",")[0] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {

controllers/schedule_api_controller.go

@@ -10,6 +10,7 @@ import (
 	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/astaxie/beego"
@@ -621,11 +622,6 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 
 }
 
-type aa struct {
-	b int64
-	c int64
-}
-
 func (this *ScheduleApiController) GetWeekDaySchedule() {
 	week_type, _ := this.GetInt64("week_type", -1)
 	fmt.Println(week_type)
@@ -757,7 +753,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 			} else {
 				var patient []*models.Patients
 				for _, item := range patients {
-					if item.Name == name {
+					if strings.Replace(item.Name, " ", "", -1) == name {
 						patient = append(patient, item)
 					}
 				}
@@ -765,7 +761,7 @@ func (this *ScheduleApiController) ExportSchedule() {
 					err_log := models.ExportErrLog{
 						LogType:    2,
 						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列的姓名在系统中不存在,请在系统中添加该病人",
+						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列,患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该病人",
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
@@ -780,9 +776,12 @@ func (this *ScheduleApiController) ExportSchedule() {
 				} else if len(patient) > 1 { //出现同名的情况
 
 					err_log := models.ExportErrLog{
-						LogType:    2,
-						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "存在同名同姓的两个病人",
+						LogType:   2,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						//ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名，无法确定到具体患者",
+
+						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列,患者姓名为\"" + name + "\"在在当前机构中存在重名，无法确定到具体患者",
+
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
@@ -1311,15 +1310,17 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 			} else {
 				var patient []*models.Patients
 				for _, item := range patients {
-					if item.Name == name {
+					if strings.Replace(item.Name, " ", "", -1) == name {
 						patient = append(patient, item)
 					}
 				}
 				if len(patient) == 0 { //错误日志
 					err_log := models.ExportErrLog{
-						LogType:    3,
-						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列的姓名在系统中不存在,请在系统中添加该病人",
+						LogType:   3,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						//ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列的姓名在系统中不存在,请在系统中添加该病人",
+						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列患者姓名为\"" + name + "\"在系统中不存在,请在系统中添加该病人",
+
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),
@@ -1334,9 +1335,11 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 				} else if len(patient) > 1 { //出现同名的情况
 
 					err_log := models.ExportErrLog{
-						LogType:    3,
-						UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-						ErrMsg:     "存在同名同姓的两个病人",
+						LogType:   3,
+						UserOrgId: this.GetAdminUserInfo().CurrentOrgId,
+						//ErrMsg:     "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列" + "患者姓名为" + name + "在当前机构中存在重名，无法确定到具体患者",
+						ErrMsg: "第" + strconv.FormatInt(int64(schMapM["index"].(float64)), 10) + "行,第" + schMapM["row"].(string) + "列患者姓名为\"" + name + "\"在当前机构中存在重名，无法确定到具体患者",
+
 						Status:     1,
 						CreateTime: time.Now().Unix(),
 						UpdateTime: time.Now().Unix(),

models/inspection_models.go

@@ -91,6 +91,7 @@ type InepectionForm struct {
 	Method      string `json:"method"`
 	ProjectId   int64  `json:"project_id"`
 	InspectDate string `json:"inspect_date"`
+	OldInspectDate string `json:"old_inspect_date"`
 	FormItem    []struct {
 		ID          int64  `json:"id"`
 		ProjectId   int64  `json:"project_id"`

数据变更脚本.sql

@@ -0,0 +1,16 @@
+--2020-06-17 author 张保健 --
+--透前评估添加体液过多症状字段--
+ALTER TABLE `sgj_xt`.`xt_assessment_before_dislysis`     ADD COLUMN `humor_excessive_symptom` SMALLINT(2) DEFAULT '0' NULL COMMENT '体液过多症状' AFTER `dialysis_intakes_unit`;
+--数据字典表里添加体液过多症状--
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '0','hemodialysis','0','体液过多症状','humor_excessive_symptom','0','2020-06-17 16:56:00','2020-06-17 16:56:00','0','1',NULL,'0',NULL,NULL,'0');
+--数据字典表里添加体液过多症状配置项，parent_id为上条语句的id--
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '1997','hemodialysis','0','无',NULL,'1','2020-06-17 16:00:00','2020-06-17 16:00:00','0','1',NULL,'0',NULL,NULL,'0');
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '1997','hemodialysis','0','下肢水肿+',NULL,'2','2020-06-17 16:00:00','2020-06-17 16:00:00','0','1',NULL,'0',NULL,NULL,'0');
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '1997','hemodialysis','0','下肢水肿++',NULL,'3','2020-06-17 16:00:00','2020-06-17 16:00:00','0','1',NULL,'0',NULL,NULL,'0');
+INSERT INTO `sgj_xt`.`xt_data_config`(`parent_id`,`module`,`org_id`,`name`,`field_name`,`value`,`create_time`,`update_time`,`create_user_id`,`status`,`remark`,`delete_id_system`,`title`,`content`,`orders`) VALUES ( '1997','hemodialysis','0','下肢水肿+++',NULL,'4','2020-06-17 16:00:00','2020-06-17 16:00:00','0','1',NULL,'0',NULL,NULL,'0');
+--显示配置里添加体液过程症状--
+INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '0','3','humor_excessive_symptom','体液过多症状','2',NULL,NULL,'0');
+--添加显示体液过程症状的机构 org_id为要显示的机构--
+INSERT INTO `sgj_xt`.`xt_filed_config`(`org_id`,`module`,`filed_name`,`filed_name_cn`,`is_show`,`create_time`,`update_time`,`sys_module`) VALUES ( '13','3','humor_excessive_symptom','体液过多症状','1',NULL,NULL,'0');
+
+