zyp преди 3 седмици
родител
ревизия
33f973b775

+ 1 - 1
fs-company/src/main/resources/application.yml

@@ -5,4 +5,4 @@ server:
 spring:
   profiles:
     active: dev
-    include: common,config-dev
+    include: common,config-zkzh

+ 6 - 1
fs-service-system/src/main/resources/application-config-zkzh.yml

@@ -65,11 +65,16 @@ wx:
         aesKey: PKvaxtpSv8NGpfTDm7VUHIK8Wok2ESyYX24qpXJAdMP
   miniapp:
     configs:
-      - appid: wx4115995705bb0ea0   #中康
+      - appid: wx4115995705bb0ea0   #中康智慧
         secret: 58910ae743005c396012b029c7def579
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON
+      - appid: wxedde588767b358b1   #中康未来智慧药房
+        secret: 928d2961c81610d8f64b019597212fcd
+        token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
+        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
+        msgDataFormat: JSON
 
   pay:
     appId: wx11a2ce7c2bbc4521 #微信公众号或者小程序等的appid

+ 0 - 155
fs-user-app/src/main/java/com/fs/app/controller/DocController.java

@@ -1,155 +0,0 @@
-package com.fs.app.controller;
-
-
-import com.fs.app.annotation.Login;
-import com.fs.app.utils.JwtUtils;
-import com.fs.common.core.domain.R;
-import com.fs.company.service.ICompanyUserService;
-import com.fs.company.vo.DocCompanyUserVO;
-import com.fs.doc.domain.Doc;
-import com.fs.doc.domain.DocOrder;
-import com.fs.doc.domain.DocRecord;
-import com.fs.doc.domain.DocRecordReply;
-import com.fs.doc.param.*;
-import com.fs.doc.service.*;
-import com.fs.doc.vo.*;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import java.util.Date;
-import java.util.List;
-
-
-@Api("随访接口")
-@RestController
-@RequestMapping(value="/app/doc")
-public class DocController extends  AppBaseController {
-	@Autowired
-    JwtUtils jwtUtils;
-	@Autowired
-	IDocService docService;
-	@Autowired
-	IDocOrderService docOrderService;
-	@Autowired
-	IDocRecordService docRecordService;
-	@Autowired
-	IDocRecordReplyService docRecordReplyService;
-	@Autowired
-	IDocOrderReplyService docOrderReplyService;
-	@Autowired
-	ICompanyUserService companyUserService;
-	@Login
-	@ApiOperation("获取健康档案")
-	@GetMapping("/getMyDocList")
-	public R getMyDocList(DocQueryParam param, HttpServletRequest request){
-		param.setUserId(Long.parseLong(getUserId()));
-		List<DocListQueryVO> list=docService.selectDocListVOQuery(param);
-		return R.ok().put("data",list);
-	}
-
-	@Login
-	@ApiOperation("获取健康档案")
-	@GetMapping("/getDocDetails")
-	public R getDocDetails(@RequestParam("docId") Long docId, HttpServletRequest request){
-		Doc doc=docService.selectDocById(docId);
-		List<DocCompanyUserVO> users=companyUserService.selectDocCompanyUserListByIds(doc.getCompanyUserIds());
-		return R.ok().put("data",docService.selectDocById(docId)).put("users",users);
-	}
-
-
-	@Login
-	@ApiOperation("添加健康档案")
-	@PostMapping("/addDoc")
-	public R addDoc(@Valid @RequestBody Doc param, HttpServletRequest request){
-		param.setUserId(Long.parseLong(getUserId()));
-		param.setCreateTime(new Date());
-		docService.insertDoc(param);
-		return R.ok("操作成功");
-	}
-
-	@Login
-	@ApiOperation("编辑健康档案")
-	@PostMapping("/editDoc")
-	public R editDoc(@Valid @RequestBody Doc param, HttpServletRequest request){
-		param.setUserId(Long.parseLong(getUserId()));
-		param.setUpdateTime(new Date());
-		docService.updateDoc(param);
-		return R.ok("操作成功");
-	}
-
-	@Login
-	@ApiOperation("删除健康档案")
-	@PostMapping("/delDoc")
-	public R delDoc(@Valid @RequestBody Doc param, HttpServletRequest request){
-		docService.deleteDocById(param.getDocId());
-		return R.ok("操作成功");
-	}
-	@Login
-	@ApiOperation("获取健康记录列表")
-	@GetMapping("/getMyDocRecordList")
-	public R getMyDocRecordList(DocRecordQueryParam param, HttpServletRequest request){
-		PageHelper.startPage(param.getPage(), param.getPageSize());
-		List<DocRecordListQueryVO> list=docRecordService.selectDocRecordListVOQuery(param);
-		PageInfo<DocRecordListQueryVO> listPageInfo=new PageInfo<>(list);
-		return R.ok().put("data",listPageInfo);
-	}
-
-	@Login
-	@ApiOperation("获取健康记录回复列表")
-	@GetMapping("/getDocRecordReplyList")
-	public R getDocRecordReplyList(DocRecordReplyQueryParam param, HttpServletRequest request){
-		PageHelper.startPage(param.getPage(), param.getPageSize());
-		List<DocRecordReplyListQueryVO> list=docRecordReplyService.selectDocRecordReplyListVOQuery(param);
-		PageInfo<DocRecordReplyListQueryVO> listPageInfo=new PageInfo<>(list);
-		return R.ok().put("data",listPageInfo);
-	}
-
-	@Login
-	@ApiOperation("添加健康记录档案")
-	@PostMapping("/addDocRecord")
-	public R addDocRecord(@Valid @RequestBody DocRecord param, HttpServletRequest request){
-		param.setUserId(Long.parseLong(getUserId()));
-		param.setCreateTime(new Date());
-		docRecordService.insertDocRecord(param);
-		return R.ok("操作成功");
-	}
-
-//	@Login
-//	@ApiOperation("获取问医生列表")
-//	@GetMapping("/getMyDocOrderList")
-//	public R getMyDocOrderList(DocOrderQueryParam param, HttpServletRequest request){
-//		PageHelper.startPage(param.getPage(), param.getPageSize());
-//		param.setUserId(Long.parseLong(getUserId()));
-//		List<DocOrderListQueryVO> list=docOrderService.selectDocOrderListVOQuery(param);
-//		PageInfo<DocOrderListQueryVO> listPageInfo=new PageInfo<>(list);
-//		return R.ok().put("data",listPageInfo);
-//	}
-
-//	@Login
-//	@ApiOperation("获取问医生回复列表")
-//	@GetMapping("/getDocOrderReplyList")
-//	public R getDocOrderReplyList(DocOrderReplyQueryParam param, HttpServletRequest request){
-//		PageHelper.startPage(param.getPage(), param.getPageSize());
-//		List<DocOrderReplyListQueryVO> list=docOrderReplyService.selectDocOrderReplyListVOQuery(param);
-//		PageInfo<DocOrderReplyListQueryVO> listPageInfo=new PageInfo<>(list);
-//		return R.ok().put("data",listPageInfo);
-//	}
-//
-//	@Login
-//	@ApiOperation("提交问医生")
-//	@PostMapping("/addDocOrder")
-//	public R addDocOrder(@Valid @RequestBody DocOrder param, HttpServletRequest request){
-//		param.setUserId(Long.parseLong(getUserId()));
-//		param.setCreateTime(new Date());
-//		docOrderService.insertDocOrder(param);
-//		return R.ok("操作成功");
-//	}
-
-
-}