代码修改

common/common-entity/src/db/2023.sql

@@ -481,3 +481,14 @@ CREATE TABLE `wlyy_patient_aim_sports` (
   UNIQUE KEY `code` (`patientcode`,`create_date`) USING BTREE
) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COMMENT='患者-运动目标';
INSERT INTO `dm_sports_type` (`id`, `code`, `name`, `del`) VALUES ('1', '1', '轻度运动', '1');
INSERT INTO `dm_sports_type` (`id`, `code`, `name`, `del`) VALUES ('2', '2', '中度运动', '1');
INSERT INTO `dm_sports_type` (`id`, `code`, `name`, `del`) VALUES ('3', '3', '稍强运动', '1');
INSERT INTO `dm_sports_type` (`id`, `code`, `name`, `del`) VALUES ('4', '4', '强度运动', '1');
INSERT INTO `dm_sports` (`id`, `code`, `name`, `type`, `del`) VALUES ('1', '1', '购物', NULL, '1');
INSERT INTO `dm_sports` (`id`, `code`, `name`, `type`, `del`) VALUES ('2', '2', '散步', NULL, '1');
INSERT INTO `dm_sports` (`id`, `code`, `name`, `type`, `del`) VALUES ('3', '3', '做操', NULL, '1');
INSERT INTO `dm_sports` (`id`, `code`, `name`, `type`, `del`) VALUES ('4', '4', '太极拳', NULL, '1');
INSERT INTO `dm_sports` (`id`, `code`, `name`, `type`, `del`) VALUES ('5', '5', '气功', NULL, '1');
INSERT INTO `dm_sports` (`id`, `code`, `name`, `type`, `del`) VALUES ('6', '6', '跑步', NULL, '1');

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -252,7 +252,8 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
					}
				}else if ("4".equalsIgnoreCase(outpatientDO.getOutpatientType())){
					consult.setType(28);//康复咨询
				}else if ("2".equalsIgnoreCase(outpatientDO.getOutpatientType())){
				}
				else if ("2".equalsIgnoreCase(outpatientDO.getOutpatientType())){
					consult.setType(12);//协同门诊
				}
			}
@@ -280,17 +281,6 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
							rsCode="0";
							mes="已挂号";
						}
						/*if ("1".equalsIgnoreCase(outpatientDO.getOutpatientType())){
							if ("2".equalsIgnoreCase(outpatientDO.getType())){
								prescriptionService.sendWxTemplateMsg(wxId,outpatientCode,null,"16","outpatientMsgRemind","");
							}
						}
						if ("3".equalsIgnoreCase(outpatientDO.getOutpatientType())){
							if ("2".equalsIgnoreCase(outpatientDO.getType())){
								prescriptionService.sendWxTemplateMsg(wxId,outpatientCode,null,"17","outpatientMsgRemind","");
							}
						}*/
					}else if("xm_hcyy_wx".equals(wxId)){ //海沧医院挂号
						if (!outpatientDO.getOutpatientType().equalsIgnoreCase("2")&&!outpatientDO.getOutpatientType().equalsIgnoreCase("3")){
							JSONObject res = hcyyPrescriptionService.registerOutPatient(outpatientCode,doctorCode);
@@ -300,19 +290,9 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
							rsCode="0";
							mes="已挂号";
						}
						/*if ("1".equalsIgnoreCase(outpatientDO.getOutpatientType())){
							if ("2".equalsIgnoreCase(outpatientDO.getType())){
								prescriptionService.sendWxTemplateMsg(wxId,outpatientCode,null,"16","outpatientMsgRemind","");
							}
						}
						if ("3".equalsIgnoreCase(outpatientDO.getOutpatientType())){
							if ("2".equalsIgnoreCase(outpatientDO.getType())){
								prescriptionService.sendWxTemplateMsg(wxId,outpatientCode,null,"17","outpatientMsgRemind","");
							}
						}*/
					}else if("xm_dsyy_wx".equals(wxId)){ //dsyy医院挂号
						if (!outpatientDO.getOutpatientType().equalsIgnoreCase("2")&&!outpatientDO.getOutpatientType().equalsIgnoreCase("3")){
						if (!outpatientDO.getOutpatientType().equalsIgnoreCase("2")&&!outpatientDO.getOutpatientType().equalsIgnoreCase("3")
								&&!outpatientDO.getOutpatientType().equalsIgnoreCase("4")){
							JSONObject res = dsyyPrescriptionService.registerOutPatient(outpatientCode,doctorCode);
							rsCode = res.getString("@RESULT");
							mes = res.getString("@MSG");
@@ -320,17 +300,6 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
							rsCode="0";
							mes="已挂号";
						}
						/*if ("1".equalsIgnoreCase(outpatientDO.getOutpatientType())){
							if ("2".equalsIgnoreCase(outpatientDO.getType())){
								prescriptionService.sendWxTemplateMsg(wxId,outpatientCode,null,"16","outpatientMsgRemind","");
							}
						}
						if ("3".equalsIgnoreCase(outpatientDO.getOutpatientType())){
							if ("2".equalsIgnoreCase(outpatientDO.getType())){
								prescriptionService.sendWxTemplateMsg(wxId,outpatientCode,null,"17","outpatientMsgRemind","");
							}
						}*/
					}else {
						if (demoFlag.equalsIgnoreCase("true")){
							rsCode="0";