Merge branch 'dev' of yeshijie/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/message/Message.java

@@ -46,7 +46,7 @@ public class Message extends IdEntity {
	private String tzType;//体征类别
	private String tzCode;//体征code
	private Integer sex;//患者性别
	private String relationCode;//业务关联code，type=6时为咨询code type=8时为续方表code
	private String relationCode;//业务关联code，type=6时为咨询code,type=7时为续方code type=8时为续方表code
	private String prescriptionStatus;//type=6续方审核状态 0待审核，1审核通过，2审核失败|type=7续方状态 0待取药，1已取药
	public String getCode() {

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/PrescriptionController.java

@@ -6,7 +6,6 @@ import com.yihu.wlyy.service.service.prescription.PrescriptionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -173,8 +172,8 @@ public class PrescriptionController extends BaseController{
							 @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode)
	{
		try {
//			String re = prescriptionService.saveRecipe(prescriptionCode);
			String re = "{\"CODE\":\"1\",\"returnData\":[[{\"VISIT_NO\":\"3277875\",\"RECIPE_NO\":\"5477158\"}]],\"byRefParaData\":[{ \"errorMsg\": \"\" }]}";
			String re = prescriptionService.saveRecipe(prescriptionCode);
//			String re = "{\"CODE\":\"1\",\"returnData\":[[{\"VISIT_NO\":\"3277875\",\"RECIPE_NO\":\"5477158\"}]],\"byRefParaData\":[{ \"errorMsg\": \"\" }]}";
//			String re = prescriptionService.testSaveRecipe();
			return Result.success("挂号开处方接口！",re);